git notes merge: Handle real, non-conflicting notes merges
[git] / t / t5100 / msg0016
1 and some content
2