X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=t%2Ft6031-merge-recursive.sh;h=c8310aee4f77e19281b2559c1f52804c7c98a81d;hb=fae09a8084c9b51632726523b477a78dd28d7d7e;hp=5bb6b93780273be6504867f07b864e5ea0194e4d;hpb=1f17868b303f762556034db81d02c55de2878e07;p=git.git

diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh
index 5bb6b9378..c8310aee4 100755
--- a/t/t6031-merge-recursive.sh
+++ b/t/t6031-merge-recursive.sh
@@ -42,7 +42,7 @@ test_expect_success 'mode change in both branches: expect conflict' '
 		echo "100755 $H 2	file2"
 		echo "100644 $H 3	file2"
 	) >expect &&
-	diff -u actual expect &&
+	test_cmp actual expect &&
 	test -x file2
 '