projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
'build' scripts before installing.
[git.git]
/
t
/
t1005-read-tree-m-2way-emu23.sh
diff --git
a/t/t1005-read-tree-m-2way-emu23.sh
b/t/t1005-read-tree-m-2way-emu23.sh
index
00c332a
..
258a372
100755
(executable)
--- a/
t/t1005-read-tree-m-2way-emu23.sh
+++ b/
t/t1005-read-tree-m-2way-emu23.sh
@@
-25,7
+25,7
@@
In the test, these paths are used:
read_tree_twoway () {
git-read-tree --emu23 "$1" "$2" &&
git-ls-files --stage &&
- git-merge-index
../../git-merge-one-file.sh
-a &&
+ git-merge-index
git-merge-one-file
-a &&
git-ls-files --stage
}