git: add --no-optional-locks option

diff --git a/t/t5536-fetch-conflicts.sh b/t/t5536-fetch-conflicts.sh
index 6c5d3a4ce0877b11bc7db530522447a65098979d..2e42cf331648a8ba57b3806443e70b94b09eb382 100755 (executable)
--- a/t/t5536-fetch-conflicts.sh
+++ b/t/t5536-fetch-conflicts.sh
@@ -22,8 +22,8 @@ verify_stderr () {
        cat >expected &&
        # We're not interested in the error
        # "fatal: The remote end hung up unexpectedly":
-       grep -E '^(fatal|warning):' <error | grep -v 'hung up' >actual | sort &&
-       test_cmp expected actual
+       test_i18ngrep -E '^(fatal|warning):' <error | grep -v 'hung up' >actual | sort &&
+       test_i18ncmp expected actual
 }
 
 test_expect_success 'setup' '