merge-recursive: Avoid doubly merging rename/add conflict contents

diff --git a/ll-merge.h b/ll-merge.h
index 5990271dce38a7f965264615d3e612f1b1210fd8..ff7ca87bfa01d0e9705f4bfd83b9e4d2c155d588 100644 (file)
--- a/ll-merge.h
+++ b/ll-merge.h
@@ -8,6 +8,7 @@
 #define LL_OPT_VIRTUAL_ANCESTOR        (1 << 0)
 #define LL_OPT_FAVOR_MASK      ((1 << 1) | (1 << 2))
 #define LL_OPT_FAVOR_SHIFT 1
+#define LL_OPT_RENORMALIZE     (1 << 3)
 
 static inline int ll_opt_favor(int flag)
 {