Merge branch 'en/merge-path-collision'

[thirdparty/git.git] / ll-merge.c

diff --git a/ll-merge.c b/ll-merge.c
index 3c8fb917e9748b1950d5df8c85aa310149f1f8df..5b8d46aedee72aab8b027cf4310b4234268965b6 100644 (file)
--- 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,