t / t5100 / msg0008on commit git notes merge: Add automatic conflict resolvers (ours, theirs, union) (3228e67)
   1>Here is an empty patch from A U Thor.
   2
   3Hey you forgot the patch!
   4