summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorCarlos Martín Nieto <cmn@dwim.me>2017-10-29 16:12:28 +0100
committerJunio C Hamano <gitster@pobox.com>2017-11-02 14:51:24 +0900
commitbab76141da04ab094ece449e2127ef43a8fa60c8 (patch)
tree8da041a25b704b420b2cc3412195f0997170c941 /Documentation/git-merge-file.txt
parentfc849d8d6b90e5c1e0c37bc0d60dd92b2fe7347f (diff)
downloadgit-bab76141da04ab094ece449e2127ef43a8fa60c8.tar.gz
diff: --indent-heuristic is no longer experimentalcn/diff-indent-no-longer-is-experimental
This heuristic has been the default since 2.14 so we should not confuse our users by saying that it's experimental and off by default. Signed-off-by: Carlos Martín Nieto <cmn@dwim.me> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions