t / t5100 / msg0015on commit diff-files: show unmerged entries correctly (095ce95)
   1  - a list
   2  - of stuff