projects
/
platform
/
upstream
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Imported Upstream version 2.11.3
[platform/upstream/git.git]
/
t
/
t6042-merge-rename-corner-cases.sh
diff --git
a/t/t6042-merge-rename-corner-cases.sh
b/t/t6042-merge-rename-corner-cases.sh
index
466fa38
..
411550d
100755
(executable)
--- a/
t/t6042-merge-rename-corner-cases.sh
+++ b/
t/t6042-merge-rename-corner-cases.sh
@@
-380,7
+380,7
@@
test_expect_success 'handle rename/rename (2to1) conflict correctly' '
git checkout B^0 &&
test_must_fail git merge -s recursive C^0 >out &&
- grep "CONFLICT (rename/rename)" out &&
+
test_i18n
grep "CONFLICT (rename/rename)" out &&
test 2 -eq $(git ls-files -s | wc -l) &&
test 2 -eq $(git ls-files -u | wc -l) &&