X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3507-cherry-pick-conflict.sh;h=c0c8330c20e80f26d51b62c8999533c5692094de;hb=76a89d6d828486f96f42c69ef0cf87bb6b72fef5;hp=95741801b0007b6ecbf22f665c4dcf3c744d5221;hpb=1c6a50bb41dc49883d447df17a6c575684ec04ff;p=git.git diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh index 95741801b..c0c8330c2 100755 --- a/t/t3507-cherry-pick-conflict.sh +++ b/t/t3507-cherry-pick-conflict.sh @@ -44,7 +44,7 @@ test_expect_success 'failed cherry-pick does not advance HEAD' ' test "$head" = "$newhead" ' -test_expect_success 'advice from failed cherry-pick' " +test_expect_success C_LOCALE_OUTPUT 'advice from failed cherry-pick' " pristine_detach initial && picked=\$(git rev-parse --short picked) &&