git notes merge: Manual conflict resolution, part 2/2
[git] / t / t5100 / msg0011
1 Here comes a commit log message, and
2 its second line is here.