Junio C Hamano 20c8cde456 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>

2012-11-27 14:19:36 -08:00

130 KiB

Raw Blame History

View Raw