Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/t/t6027-merge-binary.sh b/t/t6027-merge-binary.sh
index a7358f75b19ed75d58124a3f1e070f022a2367bb..92ca1f0f8ccabe6f01159ea3e4a73683387ec4a3 100755 (executable)
--- 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
 '