From cd1d61c44fb5c3d1c8e4c19becb66d90bbb9c676 Mon Sep 17 00:00:00 2001 From: Bert Wesarg Date: Mon, 1 Mar 2010 22:46:25 +0100 Subject: make union merge an xdl merge favor The current union merge driver is implemented as an post process. But the xdl_merge code is quite capable to produce the result by itself. Therefore move it there. Signed-off-by: Bert Wesarg Signed-off-by: Junio C Hamano --- xdiff/xdiff.h | 1 + 1 file changed, 1 insertion(+) (limited to 'xdiff/xdiff.h') diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index 3f6229edb..22614d56e 100644 --- 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)) -- cgit v1.2.1