summaryrefslogtreecommitdiffstats
path: root/xdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-11-27 23:19:36 +0100
committerJunio C Hamano <gitster@pobox.com>2012-11-27 23:19:36 +0100
commit20c8cde45656fc187e06088ef5baf0bbdfdf70bd (patch)
treea9cb9f370e9b7bcecc124fa73c8a1b7d30c25c8e /xdiff
parentdiff --stat: do not count "unmerged" entries (diff)
downloadgit-20c8cde45656fc187e06088ef5baf0bbdfdf70bd.tar.xz
git-20c8cde45656fc187e06088ef5baf0bbdfdf70bd.zip
diff --shortstat: do not count "unmerged" entries
Fix the same issue as the previous one for "git diff --stat"; unmerged entries was doubly-counted. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions