t / t5100 / msg0016on commit git notes merge: Add automatic conflict resolvers (ours, theirs, union) (3228e67)
   1and some content
   2