Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t9109: don't swallow Git errors upstream of pipes
[gitweb.git]
/
t
/
t6031-merge-filemode.sh
diff --git
a/t/t6031-merge-filemode.sh
b/t/t6031-merge-filemode.sh
index 7d06461f1396583f7ec568c9bd5bb17735938e34..87741efad319237477541823637a8bf47c1a254d 100755
(executable)
--- a/
t/t6031-merge-filemode.sh
+++ b/
t/t6031-merge-filemode.sh
@@
-61,7
+61,7
@@
do_both_modes () {
git checkout -f a2 &&
test_must_fail git merge -s $strategy b2 &&
git ls-files -u >actual &&
- test_cmp
actual expect
&&
+ test_cmp
expect actual
&&
git ls-files -s file2 | grep ^100755
'