make union merge an xdl merge favor

diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index 3f6229edbeb21bb1ca0c423d88390f3b5a05b5a2..22614d56ed0dac646027b8f51cfc70231c6c6532 100644 (file)
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -61,6 +61,7 @@ extern "C" {
 /* merge favor modes */
 #define XDL_MERGE_FAVOR_OURS 1
 #define XDL_MERGE_FAVOR_THEIRS 2
+#define XDL_MERGE_FAVOR_UNION 3
 #define XDL_MERGE_FAVOR(flags) (((flags)>>4) & 3)
 #define XDL_MERGE_FLAGS(level, style, favor) ((level)|(style)|((favor)<<4))