notes: add notes.mergeStrategy option to select default strategy
[git] / t / t5000 /
drwxr-xr-x   ..
-rw-r--r-- 10240 pax.tar