t / t5100 / msg0016on commit rebase: make resolve message clearer for inexperienced users (5fdacc1)
   1and some content
   2