notes: add notes.mergeStrategy option to select default strategy
[git] / t / t0202 /
drwxr-xr-x   ..
-rwxr-xr-x 2875 test.pl