git notes merge: Manual conflict resolution, part 2/2
[git] / t / t5100 / msg0016
1 and some content
2