X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6022-merge-rename.sh;h=b66544b76d545a396ef068438f3980b3f544efdd;hb=6cd52edbbd9acc7797cffeba1b849538285ed558;hp=e3f7ae8120aa2a46b25dd3830597cb863a5f5e20;hpb=a41acc63badf20cbb22cca61039dca9309deaa19;p=git.git

diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
index e3f7ae812..b66544b76 100755
--- a/t/t6022-merge-rename.sh
+++ b/t/t6022-merge-rename.sh
@@ -280,7 +280,7 @@ test_expect_success 'updated working tree file should prevent the merge' '
 		echo "BAD: should have complained"
 		return 1
 	}
-	diff M M.saved || {
+	test_cmp M M.saved || {
 		echo "BAD: should have left M intact"
 		return 1
 	}
@@ -301,7 +301,7 @@ test_expect_success 'updated working tree file should prevent the merge' '
 		echo "BAD: should have complained"
 		return 1
 	}
-	diff M M.saved || {
+	test_cmp M M.saved || {
 		echo "BAD: should have left M intact"
 		return 1
 	}