Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
merge-recursive: Small code clarification -- variable name and comments
[gitweb.git]
/
t
/
t1001-read-tree-m-2way.sh
diff --git
a/t/t1001-read-tree-m-2way.sh
b/t/t1001-read-tree-m-2way.sh
index 0c562bb820cb747a8f0d0df1eabb39da0b9eea21..93ca84f9e6d3dfd859d8bd4941f4d2c5a354ab6c 100755
(executable)
--- a/
t/t1001-read-tree-m-2way.sh
+++ b/
t/t1001-read-tree-m-2way.sh
@@
-359,7
+359,7
@@
test_expect_success \
test_expect_success \
'a/b (untracked) vs a, plus c/d case test.' \
- '
!
git read-tree -u -m "$treeH" "$treeM" &&
+ '
test_must_fail
git read-tree -u -m "$treeH" "$treeM" &&
git ls-files --stage &&
test -f a/b'