t / t5100 / msg0018on commit rebase: make resolve message clearer for inexperienced users (5fdacc1)
   1a commit message
   2