t / t5100 / msg0009on commit git notes merge: Manual conflict resolution, part 2/2 (6abb365)
   1This is to fix diff-format documentation.
   2