t / t5100 / msg0015on commit git notes merge: Add automatic conflict resolvers (ours, theirs, union) (3228e67)
   1  - a list
   2  - of stuff