diff options
Diffstat (limited to 't/t6031-merge-filemode.sh')
| -rwxr-xr-x | t/t6031-merge-filemode.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6031-merge-filemode.sh b/t/t6031-merge-filemode.sh index 7d06461..87741ef 100755 --- 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 ' |