Merge branches 'bp/reset-quiet' and 'js/mingw-http-ssl' into nd/config-split

diff --git a/t/t6027-merge-binary.sh b/t/t6027-merge-binary.sh
index b519626ca09255a433b0d1cb32780a6feafa09f6..4e6c7cb77e7dc42c9f21b8ca84f8a64b1ed7d3af 100755 (executable)
--- a/t/t6027-merge-binary.sh
+++ b/t/t6027-merge-binary.sh
@@ -6,7 +6,7 @@ test_description='ask merge-recursive to merge binary files'
 
 test_expect_success setup '
 
-       cat "$TEST_DIRECTORY"/test4012.png >m &&
+       cat "$TEST_DIRECTORY"/test-binary-1.png >m &&
        git add m &&
        git ls-files -s | sed -e "s/ 0  / 1     /" >E1 &&
        test_tick &&
@@ -45,7 +45,7 @@ test_expect_success resolve '
                false
        else
                git ls-files -s >current
-               test_cmp current expect
+               test_cmp expect current
        fi
 '
 
@@ -60,7 +60,7 @@ test_expect_success recursive '
                false
        else
                git ls-files -s >current
-               test_cmp current expect
+               test_cmp expect current
        fi
 '