t / t5100 / msg0009on commit merge: let custom strategies intervene in trivial merges (52b48ef)
   1This is to fix diff-format documentation.
   2