t / t5100 / msg0016on commit diff --shortstat: do not count "unmerged" entries (20c8cde)
   1and some content
   2