t / t5100 / msg0017on commit rebase: make resolve message clearer for inexperienced users (5fdacc1)
   1New content here
   2