merge-recursive: flush output buffer before printing error messages

diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 98bcfe21aa3b6088a228593c627821a7f2740407..86f23be34aa69a9a345f95554f8a32d6ac45af5d 100755 (executable)
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -66,14 +66,14 @@ test_expect_success 'reset --hard message' '
        hex=$(git log -1 --format="%h") &&
        git reset --hard > .actual &&
        echo HEAD is now at $hex $(commit_msg) > .expected &&
-       test_cmp .expected .actual
+       test_i18ncmp .expected .actual
 '
 
 test_expect_success 'reset --hard message (ISO8859-1 logoutputencoding)' '
        hex=$(git log -1 --format="%h") &&
        git -c "i18n.logOutputEncoding=$test_encoding" reset --hard > .actual &&
        echo HEAD is now at $hex $(commit_msg $test_encoding) > .expected &&
-       test_cmp .expected .actual
+       test_i18ncmp .expected .actual
 '
 
 >.diff_expect