t / t5100 / msg0015on commit rebase: show consistent conflict resolution hint (89c7ae9)
   1  - a list
   2  - of stuff