summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-09-29 14:01:21 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-09-29 14:01:21 -0700
commitac4089da7bcf63698c239a16076a144e66de96a9 (patch)
tree728c1de5f67394b258737eff5a833db7e26e313c /Documentation/git-mergetool--lib.txt
parentMerge branch 'jc/t1506-rev-parse-leaves-range-endpoint-unpeeled' (diff)
parentdiff: fix modified lines stats with --stat and --numstat (diff)
downloadtgif-ac4089da7bcf63698c239a16076a144e66de96a9.tar.xz
Merge branch 'tg/range-diff-same-file-fix'
"git range-diff" showed incorrect diffstat, which has been corrected. * tg/range-diff-same-file-fix: diff: fix modified lines stats with --stat and --numstat
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions