From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Jun 2017 00:18:10 +0000 (+0900)
Subject: Merge branch 'mb/diff-default-to-indent-heuristics'
X-Git-Tag: v2.14.0-rc0~110
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/53083f8547cd45cdfabcf2f1bd21461cd6769189

Merge branch 'mb/diff-default-to-indent-heuristics'

Make the "indent" heuristics the default in "diff" and diff.indentHeuristics
configuration variable an escape hatch for those who do no want it.

* mb/diff-default-to-indent-heuristics:
add--interactive: drop diff.indentHeuristic handling
diff: enable indent heuristic by default
diff: have the diff-* builtins configure diff before initializing revisions
diff: make the indent heuristic part of diff's basic configuration
---

53083f8547cd45cdfabcf2f1bd21461cd6769189