t / t5100 / msg0015on commit merge: let custom strategies intervene in trivial merges (52b48ef)
   1  - a list
   2  - of stuff