X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=t%2Ft5515-fetch-merge-logic.sh;h=3def75eeb29f0eeaa096ab4b9f4511a01a3ce3d8;hb=5f54de5bd07481f6d88e8dbd5551f3356ecbf513;hp=65c37744aaa074d173afb862ca43fa668bc19452;hpb=b88605f6d4b2b1b8dd805da9e91feccb68b4c840;p=~andy%2Fgit

diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh
index 65c37744a..3def75eeb 100755
--- a/t/t5515-fetch-merge-logic.sh
+++ b/t/t5515-fetch-merge-logic.sh
@@ -151,7 +151,7 @@ do
 		git show-ref >"$actual_r" &&
 		if test -f "$expect_f"
 		then
-			git diff -u "$expect_f" "$actual_f" &&
+			test_cmp "$expect_f" "$actual_f" &&
 			rm -f "$actual_f"
 		else
 			# this is to help developing new tests.
@@ -160,7 +160,7 @@ do
 		fi &&
 		if test -f "$expect_r"
 		then
-			git diff -u "$expect_r" "$actual_r" &&
+			test_cmp "$expect_r" "$actual_r" &&
 			rm -f "$actual_r"
 		else
 			# this is to help developing new tests.