Merge branch 'master' into pb/gitpm

[git.git] / xdiff / xdiff.h

diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index 2ce10b4c0d18aca467d3fb7a47badefa8c7c956f..c9f817818a781164b63c78be2af71a5d21e35d6f 100644 (file)
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -39,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)