diff options
| -rw-r--r-- | merge-recursive.c | 5 | ||||
| -rwxr-xr-x | t/t7405-submodule-merge.sh | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index ee853b990..3618c94bd 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1123,10 +1123,11 @@ static int process_entry(struct merge_options *o, clean_merge = mfi.clean; if (mfi.clean) update_file(o, 1, mfi.sha, mfi.mode, path); - else if (S_ISGITLINK(mfi.mode)) + else if (S_ISGITLINK(mfi.mode)) { output(o, 1, "CONFLICT (submodule): Merge conflict in %s " "- needs %s", path, sha1_to_hex(b.sha1)); - else { + update_file(o, 0, mfi.sha, mfi.mode, path); + } else { output(o, 1, "CONFLICT (%s): Merge conflict in %s", reason, path); diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh index 9778ad49c..aa6c44ce4 100755 --- a/t/t7405-submodule-merge.sh +++ b/t/t7405-submodule-merge.sh @@ -63,7 +63,7 @@ test_expect_failure 'merging with modify/modify conflict' ' ' -test_expect_failure 'merging with a modify/modify conflict between merge bases' ' +test_expect_success 'merging with a modify/modify conflict between merge bases' ' git reset --hard HEAD && git checkout -b test2 c && |