X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=xdiff%2Fxdiff.h;h=c9f817818a781164b63c78be2af71a5d21e35d6f;hb=9673198ee867cea4ed70d2cf54c1a2eb8f27bb46;hp=2540e8a2ccc6781d23a42c03dadc050a3e233c39;hpb=7fb23e6083dbefa8eb4c554d8b2cd5a6292b2df4;p=git.git

diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index 2540e8a2c..c9f817818 100644
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -29,6 +29,9 @@ extern "C" {
 
 
 #define XDF_NEED_MINIMAL (1 << 1)
+#define XDF_IGNORE_WHITESPACE (1 << 2)
+#define XDF_IGNORE_WHITESPACE_CHANGE (1 << 3)
+#define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE)
 
 #define XDL_PATCH_NORMAL '-'
 #define XDL_PATCH_REVERSE '+'
@@ -36,6 +39,7 @@ extern "C" {
 #define XDL_PATCH_IGNOREBSPACE (1 << 8)
 
 #define XDL_EMIT_FUNCNAMES (1 << 0)
+#define XDL_EMIT_COMMON (1 << 1)
 
 #define XDL_MMB_READONLY (1 << 0)