notes: add notes.mergeStrategy option to select default strategy
[git] / t / t5100 / msg0015
1   - a list
2   - of stuff