Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-submodule summary: show commit summary
[gitweb.git]
/
xdiff
/
xdiff.h
diff --git
a/xdiff/xdiff.h
b/xdiff/xdiff.h
index c00ddaa6e987407743d2c8877f9ca6e772f89c86..413082e1fdf537d230a0f58940cee7466b965d0e 100644
(file)
--- a/
xdiff/xdiff.h
+++ b/
xdiff/xdiff.h
@@
-53,6
+53,7
@@
extern "C" {
#define XDL_MERGE_MINIMAL 0
#define XDL_MERGE_EAGER 1
#define XDL_MERGE_ZEALOUS 2
+#define XDL_MERGE_ZEALOUS_ALNUM 3
typedef struct s_mmfile {
char *ptr;