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.13.7
[platform/upstream/git.git]
/
t
/
t6020-merge-df.sh
diff --git
a/t/t6020-merge-df.sh
b/t/t6020-merge-df.sh
index
27c3d73
..
2af1bee
100755
(executable)
--- a/
t/t6020-merge-df.sh
+++ b/
t/t6020-merge-df.sh
@@
-24,7
+24,7
@@
test_expect_success 'prepare repository' '
'
test_expect_success 'Merge with d/f conflicts' '
- test_expect_code 1 git merge
"merge msg" B
master
+ test_expect_code 1 git merge
-m "merge msg"
master
'
test_expect_success 'F/D conflict' '