Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
xdiff/xdiff.h: remove unused flags
author
Stefan Beller
<sbeller@google.com>
Mon, 16 Jul 2018 23:05:34 +0000
(16:05 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 17 Jul 2018 18:25:31 +0000
(11:25 -0700)
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>
xdiff/xdiff.h
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
fe0a9ea
)
diff --git
a/xdiff/xdiff.h
b/xdiff/xdiff.h
index c1937a291126ca5e451763ccdf22bf8cccd0bd42..2356da5f784fbe5670b3f9e8bbc6d6419b4fa9d3 100644
(file)
--- 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