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
/
t7600-merge.sh
diff --git
a/t/t7600-merge.sh
b/t/t7600-merge.sh
index b147a1bd69e96e48d3808028a3775a609471639a..87d5d788cb1884fdfe218ec30582f5d3da8b5d7d 100755
(executable)
--- a/
t/t7600-merge.sh
+++ b/
t/t7600-merge.sh
@@
-495,7
+495,7
@@
test_expect_success 'merge fast-forward in a dirty tree' '
test_debug 'git log --graph --decorate --oneline --all'
-test_expect_success 'in-index merge' '
+test_expect_success
C_LOCALE_OUTPUT
'in-index merge' '
git reset --hard c0 &&
git merge --no-ff -s resolve c1 >out &&
grep "Wonderful." out &&