t / t5100 / msg0006on commit git notes merge: Add automatic conflict resolvers (ours, theirs, union) (3228e67)
   1Here is a patch from A U Thor.
   2