t / t5100 / msg0009on commit git notes merge: Add automatic conflict resolvers (ours, theirs, union) (3228e67)
   1This is to fix diff-format documentation.
   2