git notes merge: Manual conflict resolution, part 2/2
[git] / t / t5100 / msg0015
1   - a list
2   - of stuff