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.16.4
[platform/upstream/git.git]
/
t
/
t7607-merge-overwrite.sh
diff --git
a/t/t7607-merge-overwrite.sh
b/t/t7607-merge-overwrite.sh
index
1c59349
..
9444d6a
100755
(executable)
--- a/
t/t7607-merge-overwrite.sh
+++ b/
t/t7607-merge-overwrite.sh
@@
-125,7
+125,7
@@
test_expect_success 'will not overwrite untracked file in leading path' '
cp important sub &&
cp important sub2 &&
test_must_fail git merge sub 2>out &&
- test_cmp out expect &&
+ test_
i18n
cmp out expect &&
test_path_is_missing .git/MERGE_HEAD &&
test_cmp important sub &&
test_cmp important sub2 &&