diff --shortstat: do not count "unmerged" entries
[git] / t / t9603 / cvsroot / module /
drwxr-xr-x   ..
-rw-r--r-- 589 a,v
-rw-r--r-- 703 b,v