git notes merge: Manual conflict resolution, part 2/2
[git] / t / t5100 / msg0009
1 This is to fix diff-format documentation.
2