notes: add notes.mergeStrategy option to select default strategy
[git] / t / t5100 / msg0016
1 and some content
2