Merge branch 'jk/reset-ident-time-per-commit' into maint

diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index 4fb7e79410c22fba1fb390af2e09008e932f5ea8..7423f77fc8b2682c121e8d4adb855337e107b29e 100644 (file)
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -41,6 +41,8 @@ extern "C" {
 
 #define XDF_IGNORE_BLANK_LINES (1 << 7)
 
+#define XDF_COMPACTION_HEURISTIC (1 << 8)
+
 #define XDL_EMIT_FUNCNAMES (1 << 0)
 #define XDL_EMIT_FUNCCONTEXT (1 << 2)