diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-06 23:45:46 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-06 23:45:46 +0200 |
| commit | 0018da1088e3d7e282998d80db3c719fa7a18ce3 (patch) | |
| tree | 68f5adf91842c3aabd6db45afaa29e989be885b5 /xdiff/xdiff.h | |
| parent | Merge branch 'ls/p4-lfs-test-fix-2.7.0' (diff) | |
| parent | diff: undocument the compaction heuristic knobs for experimentation (diff) | |
| download | git-0018da1088e3d7e282998d80db3c719fa7a18ce3.tar.xz git-0018da1088e3d7e282998d80db3c719fa7a18ce3.zip | |
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
Diffstat (limited to 'xdiff/xdiff.h')
| -rw-r--r-- | xdiff/xdiff.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index 4fb7e79410..7423f77fc8 100644 --- 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) |