Merge branch 'jk/combine-diff-binary-etc'

diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
index 95741801b0007b6ecbf22f665c4dcf3c744d5221..212ec54aaf0d805bbdecd93f3311d248a57d5b08 100755 (executable)
--- a/t/t3507-cherry-pick-conflict.sh
+++ b/t/t3507-cherry-pick-conflict.sh
@@ -56,7 +56,7 @@ test_expect_success 'advice from failed cherry-pick' "
        EOF
        test_must_fail git cherry-pick picked 2>actual &&
 
-       test_cmp expected actual
+       test_i18ncmp expected actual
 "
 
 test_expect_success 'failed cherry-pick sets CHERRY_PICK_HEAD' '