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