Fix severe breakage in "git-apply --whitespace=fix"

diff --git a/t/t6029-merge-subtree.sh b/t/t6029-merge-subtree.sh
index 43f5459c35dd862b2b15b9883a4f2354a20e8e25..5bbfa44e8d9ee3eebb18eb07e93380c802741a18 100755 (executable)
--- a/t/t6029-merge-subtree.sh
+++ b/t/t6029-merge-subtree.sh
@@ -57,7 +57,7 @@ test_expect_success 'initial merge' '
                echo "100644 $o1 0      git-gui/git-gui.sh"
                echo "100644 $o2 0      git.c"
        ) >expected &&
-       git diff -u expected actual
+       test_cmp expected actual
 '
 
 test_expect_success 'merge update' '
@@ -73,7 +73,7 @@ test_expect_success 'merge update' '
                echo "100644 $o3 0      git-gui/git-gui.sh"
                echo "100644 $o2 0      git.c"
        ) >expected &&
-       git diff -u expected actual
+       test_cmp expected actual
 '
 
 test_done