notes: add notes.mergeStrategy option to select default strategy
[git] / t / t4034 / python /
drwxr-xr-x   ..
-rw-r--r-- 2019 expect
-rw-r--r-- 239 post
-rw-r--r-- 226 pre