t / t5100 / msg0008on commit git notes merge: Manual conflict resolution, part 2/2 (6abb365)
   1>Here is an empty patch from A U Thor.
   2
   3Hey you forgot the patch!
   4