summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-11-06 13:11:27 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-11-06 13:11:27 +0900
commit662ac3b3a8a16fd749b598c85c4d8bfea5bb208e (patch)
treedf06d7c450c987d4f94c8e5b9ae1ccf109ef077d /git-mergetool.sh
parentMerge branch 'bw/grep-recurse-submodules' (diff)
parentdiff: --indent-heuristic is no longer experimental (diff)
downloadtgif-662ac3b3a8a16fd749b598c85c4d8bfea5bb208e.tar.xz
Merge branch 'cn/diff-indent-no-longer-is-experimental'
Doc update. * cn/diff-indent-no-longer-is-experimental: diff: --indent-heuristic is no longer experimental
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions