diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-14 15:35:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-09 15:42:16 -0700 |
| commit | d694a17986a28bbc19e2a6c32404ca24572e400f (patch) | |
| tree | d6fe8a53fb759e62dcb10143124ad3a695aed152 /ll-merge.c | |
| parent | ed34567c7bb1f3747255ca0301b84abad6d06712 (diff) | |
| download | git-d694a17986a28bbc19e2a6c32404ca24572e400f.tar.gz | |
ll-merge: use a longer conflict marker for internal merge
The primary use of conflict markers is to help the user who resolves
the final (outer) merge by hand to show which part came from which
branch by separating the blocks of lines apart. When the conflicted
parts from a "virtual ancestor" merge created by merge-recursive
remains in the common ancestor part in the final result, however,
the conflict markers that are the same size as the final merge
become harder to see.
Increase the conflict marker size slightly for these inner merges so
that the markers from the final merge and cruft from internal merge
can be distinguished more easily.
This would help reduce the common issue that prevents "rerere" from
being used on a really complex conflict.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
| -rw-r--r-- | ll-merge.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ll-merge.c b/ll-merge.c index 5c73274b13..e5ff7f6cb9 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -376,8 +376,12 @@ int ll_merge(mmbuffer_t *result_buf, } } driver = find_ll_merge_driver(ll_driver_name); - if (opts->virtual_ancestor && driver->recursive) - driver = find_ll_merge_driver(driver->recursive); + + if (opts->virtual_ancestor) { + if (driver->recursive) + driver = find_ll_merge_driver(driver->recursive); + marker_size += 2; + } return driver->fn(driver, result_buf, path, ancestor, ancestor_label, ours, our_label, theirs, their_label, opts, marker_size); |