X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6200-fmt-merge-msg.sh;h=526d7d1c4422e342c7257e260626dac3dda36a3a;hb=4340a813d007b592534de664d152d66417dbe809;hp=63e49f310cdc0bf99cb1578c29f2a3da4059da75;hpb=f3c5b39567535a41a371aad8a6affbeea0d4c0b9;p=git.git

diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index 63e49f310..526d7d1c4 100755
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -79,7 +79,7 @@ test_expect_success 'merge-msg test #1' '
 	git fetch . left &&
 
 	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-	diff -u actual expected
+	git diff actual expected
 '
 
 cat >expected <<\EOF
@@ -92,7 +92,7 @@ test_expect_success 'merge-msg test #2' '
 	git fetch ../trash left &&
 
 	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-	diff -u actual expected
+	git diff actual expected
 '
 
 cat >expected <<\EOF
@@ -108,14 +108,14 @@ EOF
 
 test_expect_success 'merge-msg test #3' '
 
-	git repo-config merge.summary true &&
+	git config merge.summary true &&
 
 	git checkout master &&
 	setdate &&
 	git fetch . left &&
 
 	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-	diff -u actual expected
+	git diff actual expected
 '
 
 cat >expected <<\EOF
@@ -138,26 +138,26 @@ EOF
 
 test_expect_success 'merge-msg test #4' '
 
-	git repo-config merge.summary true &&
+	git config merge.summary true &&
 
 	git checkout master &&
 	setdate &&
 	git fetch . left right &&
 
 	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-	diff -u actual expected
+	git diff actual expected
 '
 
 test_expect_success 'merge-msg test #5' '
 
-	git repo-config merge.summary yes &&
+	git config merge.summary yes &&
 
 	git checkout master &&
 	setdate &&
 	git fetch . left right &&
 
 	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-	diff -u actual expected
+	git diff actual expected
 '
 
 test_done