git notes merge: Manual conflict resolution, part 2/2
[git] / t / t5100 / msg0007
1 Here is an empty patch from A U Thor.
2