X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6027-merge-binary.sh;h=92ca1f0f8ccabe6f01159ea3e4a73683387ec4a3;hb=c30e699fc509f43f459c17d3148e7d866fb9157a;hp=a7358f75b19ed75d58124a3f1e070f022a2367bb;hpb=5071877d2c623ffc41b48bbb49908a61051a6228;p=git.git diff --git a/t/t6027-merge-binary.sh b/t/t6027-merge-binary.sh index a7358f75b..92ca1f0f8 100755 --- a/t/t6027-merge-binary.sh +++ b/t/t6027-merge-binary.sh @@ -45,7 +45,7 @@ test_expect_success resolve ' false else git ls-files -s >current - diff -u current expect + test_cmp current expect fi ' @@ -60,7 +60,7 @@ test_expect_success recursive ' false else git ls-files -s >current - diff -u current expect + test_cmp current expect fi '