projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'maint'
[git.git]
/
t
/
t7600-merge.sh
diff --git
a/t/t7600-merge.sh
b/t/t7600-merge.sh
index 9e27bbf902e275671cb80310630a8bedcaab353c..5e19598fe72787e17d521980a3edfacb1dfa2024 100755
(executable)
--- a/
t/t7600-merge.sh
+++ b/
t/t7600-merge.sh
@@
-157,7
+157,7
@@
test_expect_success 'merge -h with invalid index' '
>.git/index &&
test_expect_code 129 git merge -h 2>usage
) &&
- grep "[Uu]sage: git merge" broken/usage
+
test_i18n
grep "[Uu]sage: git merge" broken/usage
'
test_expect_success 'reject non-strategy with a git-merge-foo name' '