Merge branch 'js/submodule-in-excluded'

diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index d4b217b0ee5136d2836ba9526b286659d66afe80..76c223c9675cd1531ac078fa9e0c1f8cc4e09781 100755 (executable)
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -187,7 +187,7 @@ test_expect_success 'format of merge conflict from checkout -m' '
        d
        >>>>>>> local
        EOF
-       test_cmp two expect
+       test_cmp expect two
 '
 
 test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
@@ -213,7 +213,7 @@ test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
        d
        >>>>>>> local
        EOF
-       test_cmp two expect
+       test_cmp expect two
 '
 
 test_expect_success 'switch to another branch while carrying a deletion' '