diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-01-10 15:24:27 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-01-10 15:24:27 -0800 |
commit | 2ced5f2c2ddcfe3a45d75ae1d552c11cad70236d (patch) | |
tree | 119f95fb9e29fc40c111984b0ab51f75d2a65f68 /xdiff/xdiff.h | |
parent | Merge branch 'nd/config-misc-fixes' (diff) | |
parent | diff: retire "compaction" heuristics (diff) | |
download | tgif-2ced5f2c2ddcfe3a45d75ae1d552c11cad70236d.tar.xz |
Merge branch 'jc/retire-compaction-heuristics'
"git diff" and its family had two experimental heuristics to shift
the contents of a hunk to make the patch easier to read. One of
them turns out to be better than the other, so leave only the
"--indent-heuristic" option and remove the other one.
* jc/retire-compaction-heuristics:
diff: retire "compaction" heuristics
Diffstat (limited to 'xdiff/xdiff.h')
-rw-r--r-- | xdiff/xdiff.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index 8db16d4ae6..b090ad8eac 100644 --- a/xdiff/xdiff.h +++ b/xdiff/xdiff.h @@ -41,8 +41,7 @@ extern "C" { #define XDF_IGNORE_BLANK_LINES (1 << 7) -#define XDF_COMPACTION_HEURISTIC (1 << 8) -#define XDF_INDENT_HEURISTIC (1 << 9) +#define XDF_INDENT_HEURISTIC (1 << 8) #define XDL_EMIT_FUNCNAMES (1 << 0) #define XDL_EMIT_FUNCCONTEXT (1 << 2) |