t / t5100 / msg0016on commit rebase: show consistent conflict resolution hint (89c7ae9)
   1and some content
   2