t / t5100 / msg0006on commit merge: let custom strategies intervene in trivial merges (52b48ef)
   1Here is a patch from A U Thor.
   2