Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t5541-http-push: add test for chunked
[gitweb.git]
/
t
/
t3507-cherry-pick-conflict.sh
diff --git
a/t/t3507-cherry-pick-conflict.sh
b/t/t3507-cherry-pick-conflict.sh
index 95741801b0007b6ecbf22f665c4dcf3c744d5221..c0c8330c20e80f26d51b62c8999533c5692094de 100755
(executable)
--- 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) &&