t / t5100 / msg0001on commit git notes merge: Manual conflict resolution, part 2/2 (6abb365)
   1Here is a patch from A U Thor.
   2