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 /resolve-undo.h | |
| parent | 42087233c35793a3c2279dd4deab9d021142f100 (diff) | |
| parent | 3cde4e02ee891bff53bac7f6a7d977f50418a4b5 (diff) | |
| download | git-2ced5f2c2ddcfe3a45d75ae1d552c11cad70236d.tar.gz git-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 'resolve-undo.h')
0 files changed, 0 insertions, 0 deletions