Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
[PATCH] Add function to append to an object_list.
[gitweb.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 00c332a1407a86096cbaf06ef5d8ec613a412190..258a372ed717a1250473364c7be9c7920062bd0e 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
}