Merge branch 'maint'

diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index bd4e49bf1e979a9b260a2aa23be60d15c911397a..8f5a06f7dd8383722022eb7a8abd0ff9bafa6f45 100755 (executable)
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -79,20 +79,20 @@ test_expect_success 'merge-msg test #1' '
        git fetch . left &&
 
        git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-       git diff actual expected
+       test_cmp expected actual
 '
 
-cat >expected <<\EOF
-Merge branch 'left' of ../trash
+cat >expected <<EOF
+Merge branch 'left' of $TEST_DIRECTORY/$test
 EOF
 
 test_expect_success 'merge-msg test #2' '
 
        git checkout master &&
-       git fetch ../trash left &&
+       git fetch "$TEST_DIRECTORY/$test" left &&
 
        git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-       git diff actual expected
+       test_cmp expected actual
 '
 
 cat >expected <<\EOF
@@ -117,7 +117,7 @@ test_expect_success 'merge-msg test #3-1' '
        git fetch . left &&
 
        git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-       git diff actual expected
+       test_cmp expected actual
 '
 
 test_expect_success 'merge-msg test #3-2' '
@@ -131,7 +131,7 @@ test_expect_success 'merge-msg test #3-2' '
        git fetch . left &&
 
        git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-       git diff actual expected
+       test_cmp expected actual
 '
 
 cat >expected <<\EOF
@@ -163,7 +163,7 @@ test_expect_success 'merge-msg test #4-1' '
        git fetch . left right &&
 
        git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-       git diff actual expected
+       test_cmp expected actual
 '
 
 test_expect_success 'merge-msg test #4-2' '
@@ -177,7 +177,7 @@ test_expect_success 'merge-msg test #4-2' '
        git fetch . left right &&
 
        git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-       git diff actual expected
+       test_cmp expected actual
 '
 
 test_expect_success 'merge-msg test #5-1' '
@@ -191,7 +191,7 @@ test_expect_success 'merge-msg test #5-1' '
        git fetch . left right &&
 
        git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-       git diff actual expected
+       test_cmp expected actual
 '
 
 test_expect_success 'merge-msg test #5-2' '
@@ -205,7 +205,7 @@ test_expect_success 'merge-msg test #5-2' '
        git fetch . left right &&
 
        git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-       git diff actual expected
+       test_cmp expected actual
 '
 
 test_done