diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-01-05 00:33:32 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-05 00:33:32 +0300 |
| commit | ac193e0e0aa5e93263b82777219167c83c316b7e (patch) | |
| tree | c10d2d6c8eaeb8f5f62885f3ba7747802c7bcd14 /ll-merge.c | |
| parent | 3813a89faee3ecb111aa206f68b46618ec853e4e (diff) | |
| parent | cc4cb0902c2e4f9bc003b52f33da8fcb6020f649 (diff) | |
Merge branch 'en/merge-path-collision'
Updates for corner cases in merge-recursive.
* en/merge-path-collision:
t6036: avoid non-portable "cp -a"
merge-recursive: combine error handling
t6036, t6043: increase code coverage for file collision handling
merge-recursive: improve rename/rename(1to2)/add[/add] handling
merge-recursive: use handle_file_collision for add/add conflicts
merge-recursive: improve handling for rename/rename(2to1) conflicts
merge-recursive: fix rename/add conflict handling
merge-recursive: new function for better colliding conflict resolutions
merge-recursive: increase marker length with depth of recursion
t6036, t6042: testcases for rename collision of already conflicting files
t6042: add tests for consistency in file collision conflict handling
Diffstat (limited to 'll-merge.c')
| -rw-r--r-- | ll-merge.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ll-merge.c b/ll-merge.c index 3c8fb917e9..5b8d46aede 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -384,7 +384,9 @@ int ll_merge(mmbuffer_t *result_buf, if (opts->virtual_ancestor) { if (driver->recursive) driver = find_ll_merge_driver(driver->recursive); - marker_size += 2; + } + if (opts->extra_marker_size) { + marker_size += opts->extra_marker_size; } return driver->fn(driver, result_buf, path, ancestor, ancestor_label, ours, our_label, theirs, their_label, |