notes: add notes.mergeStrategy option to select default strategy
[git] / t / t9602 / cvsroot / module /
drwxr-xr-x   ..
-rw-r--r-- 1415 default,v
drwxr-xr-x - sub1
drwxr-xr-x - sub2
drwxr-xr-x - sub3