Merge branch 'jk/ansi-color'

diff --git a/diff.c b/diff.c
index d3734d3181b7eebedf80bf6f3d534c61961dca9f..fa78fc189cd7225767817a2d24ef6c3b19bef9d8 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -26,7 +26,7 @@
 #endif
 
 static int diff_detect_rename_default;
-static int diff_compaction_heuristic = 1;
+static int diff_compaction_heuristic; /* experimental */
 static int diff_rename_limit_default = 400;
 static int diff_suppress_blank_empty;
 static int diff_use_color_default = -1;