diff --shortstat: do not count "unmerged" entries
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Nov 2012 22:19:36 +0000 (14:19 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Nov 2012 22:19:36 +0000 (14:19 -0800)
commit20c8cde45656fc187e06088ef5baf0bbdfdf70bd
treea9cb9f370e9b7bcecc124fa73c8a1b7d30c25c8e
parent82dfc2c44ecda8a7afe417086c704b141a11cd58
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>
diff.c