diff --shortstat: do not count "unmerged" entries