Merge branch 'sg/cvs-tests-with-x'

diff --git a/t/t7005-editor.sh b/t/t7005-editor.sh
index 1b530b5022fb58ce51ad8cd44c630acdca613311..29e5043b9452b9c32a0d8ad437fb33745b296ac6 100755 (executable)
--- a/t/t7005-editor.sh
+++ b/t/t7005-editor.sh
@@ -38,7 +38,7 @@ test_expect_success setup '
        test_commit "$msg" &&
        echo "$msg" >expect &&
        git show -s --format=%s > actual &&
-       test_cmp actual expect
+       test_cmp expect actual
 
 '
 
@@ -85,7 +85,7 @@ do
                git --exec-path=. commit --amend &&
                git show -s --pretty=oneline |
                sed -e "s/^[0-9a-f]* //" >actual &&
-               test_cmp actual expect
+               test_cmp expect actual
        '
 done
 
@@ -107,7 +107,7 @@ do
                git --exec-path=. commit --amend &&
                git show -s --pretty=oneline |
                sed -e "s/^[0-9a-f]* //" >actual &&
-               test_cmp actual expect
+               test_cmp expect actual
        '
 done