diff options
| author |  Bert Wesarg <bert.wesarg@googlemail.com> | 2010-03-01 22:46:25 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-03-02 11:43:40 -0800 |
| commit | cd1d61c44fb5c3d1c8e4c19becb66d90bbb9c676 (patch) | |
| tree | 339840994a9f049d433d90b73762679a6d6b0485 /xdiff/xdiff.h | |
| parent | Git 1.7.0 (diff) | |
| download | tgif-cd1d61c44fb5c3d1c8e4c19becb66d90bbb9c676.tar.xz | |
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 <bert.wesarg@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xdiff.h')
| -rw-r--r-- | xdiff/xdiff.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index 3f6229edbe..22614d56ed 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)) |