t / t5100 / msg0001on commit git-revert with conflicts to behave as git-merge with conflicts (a9cb3c6)
   1Here is a patch from A U Thor.
   2