X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3507-cherry-pick-conflict.sh;h=c0c8330c20e80f26d51b62c8999533c5692094de;hb=2f80de956f71880b000933b1b9bff4991c5b3ca9;hp=95741801b0007b6ecbf22f665c4dcf3c744d5221;hpb=f59bf09678ae33901febdf61e03c91bb8eebd970;p=git.git diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh index 95741801b..212ec54aa 100755 --- 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' '