t / t5100 / msg0001on commit rebase: show consistent conflict resolution hint (89c7ae9)
   1Here is a patch from A U Thor.
   2