notes: add notes.mergeStrategy option to select default strategy
[git] / t / t9603 /
drwxr-xr-x   ..
drwxr-xr-x - cvsroot