notes: add notes.mergeStrategy option to select default strategy
[git] / t / t4034 / ada /
drwxr-xr-x   ..
-rw-r--r-- 1168 expect
-rw-r--r-- 148 post
-rw-r--r-- 149 pre