xdiff/xdiff.h: remove unused flags
These flags were there since the beginning (3443546f6e
(Use a *real*
built-in diff generator, 2006-03-24), but were never used. Remove them.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
fe0a9eaf31
commit
25790be634
@ -52,14 +52,6 @@ extern "C" {
|
|||||||
#define XDL_EMIT_FUNCNAMES (1 << 0)
|
#define XDL_EMIT_FUNCNAMES (1 << 0)
|
||||||
#define XDL_EMIT_FUNCCONTEXT (1 << 2)
|
#define XDL_EMIT_FUNCCONTEXT (1 << 2)
|
||||||
|
|
||||||
#define XDL_MMB_READONLY (1 << 0)
|
|
||||||
|
|
||||||
#define XDL_MMF_ATOMIC (1 << 0)
|
|
||||||
|
|
||||||
#define XDL_BDOP_INS 1
|
|
||||||
#define XDL_BDOP_CPY 2
|
|
||||||
#define XDL_BDOP_INSB 3
|
|
||||||
|
|
||||||
/* merge simplification levels */
|
/* merge simplification levels */
|
||||||
#define XDL_MERGE_MINIMAL 0
|
#define XDL_MERGE_MINIMAL 0
|
||||||
#define XDL_MERGE_EAGER 1
|
#define XDL_MERGE_EAGER 1
|
||||||
|
Loading…
Reference in New Issue
Block a user