diff options
| -rw-r--r-- | merge-recursive.c | 1 | ||||
| -rwxr-xr-x | t/t6036-recursive-corner-cases.sh | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index b9bc95a659..6ffc67ade4 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1061,6 +1061,7 @@ static int process_renames(struct merge_options *o, mfi.sha, mfi.mode, ren1_dst); + try_merge = 0; } else { new_path = unique_path(o, ren1_dst, branch2); output(o, 1, "Adding as %s instead", new_path); diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh index 6c2b2bfa67..a2e5c5c08f 100755 --- a/t/t6036-recursive-corner-cases.sh +++ b/t/t6036-recursive-corner-cases.sh @@ -120,7 +120,7 @@ test_expect_success 'setup criss-cross + rename merges with basic modification' git tag R2 ' -test_expect_failure 'merge criss-cross + rename merges with basic modification' ' +test_expect_success 'merge criss-cross + rename merges with basic modification' ' git reset --hard && git checkout L2^0 && @@ -202,7 +202,7 @@ test_expect_success 'setup differently handled merges of rename/add conflict' ' git tag E ' -test_expect_failure 'git detects differently handled merges conflict' ' +test_expect_success 'git detects differently handled merges conflict' ' git reset --hard && git checkout D^0 && |