diff options
| author |  Stefan Beller <sbeller@google.com> | 2018-07-16 16:05:34 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-17 11:25:31 -0700 |
| commit | 25790be634afc3eb28a2ba8d0f6579aaab10bc27 (patch) | |
| tree | 3f35d43d86025032a5f6a4a412f09a17eff862a7 | |
| parent | Merge branch 'svn/authors-prog-2' of git://bogomips.org/git-svn (diff) | |
| download | tgif-25790be634afc3eb28a2ba8d0f6579aaab10bc27.tar.xz | |
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>
| -rw-r--r-- | xdiff/xdiff.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index c1937a2911..2356da5f78 100644 --- a/xdiff/xdiff.h +++ b/xdiff/xdiff.h @@ -52,14 +52,6 @@ extern "C" { #define XDL_EMIT_FUNCNAMES (1 << 0) #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 */ #define XDL_MERGE_MINIMAL 0 #define XDL_MERGE_EAGER 1 |