merge-recursive: improve handling for rename/rename(2to1) conflicts

diff --git a/ll-merge.h b/ll-merge.h
index b72b19921e8f33ab23aa5bb6293b9b6841035df9..5b4e1585024592c194eda9c0271cfe30ddf0b41c 100644 (file)
--- a/ll-merge.h
+++ b/ll-merge.h
@@ -11,6 +11,7 @@ struct ll_merge_options {
        unsigned virtual_ancestor : 1;
        unsigned variant : 2;   /* favor ours, favor theirs, or union merge */
        unsigned renormalize : 1;
+       unsigned extra_marker_size;
        long xdl_opts;
 };