t / t5100 / msg0016on commit diff-highlight: avoid highlighting combined diffs (3dbfe2b)
   1and some content
   2