From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 May 2016 21:45:46 +0000 (-0700)
Subject: Merge branch 'jk/diff-compact-heuristic'
X-Git-Tag: v2.9.0-rc0~63
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0018da1088e3d7e282998d80db3c719fa7a18ce3

Merge branch 'jk/diff-compact-heuristic'

Patch output from "git diff" and friends has been tweaked to be
more readable by using a blank line as a strong hint that the
contents before and after it belong to a logically separate unit.

* jk/diff-compact-heuristic:
diff: undocument the compaction heuristic knobs for experimentation
xdiff: implement empty line chunk heuristic
xdiff: add recs_match helper function
---

0018da1088e3d7e282998d80db3c719fa7a18ce3
diff --cc xdiff/xdiff.h
index 4fb7e79410,d1dbb2750a..7423f77fc8
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@@ -41,7 -41,10 +41,9 @@@ extern "C" 
  
  #define XDF_IGNORE_BLANK_LINES (1 << 7)
  
+ #define XDF_COMPACTION_HEURISTIC (1 << 8)
+ 
  #define XDL_EMIT_FUNCNAMES (1 << 0)
 -#define XDL_EMIT_COMMON (1 << 1)
  #define XDL_EMIT_FUNCCONTEXT (1 << 2)
  
  #define XDL_MMB_READONLY (1 << 0)