notes: add notes.mergeStrategy option to select default strategy
[gitweb.git] / t / t4034 / pascal /
drwxr-xr-x   parent (dest: t/t4034; base: d2d68d9975da4a15dfca0e6e59001948e5bf57f9)
-rw-r--r-- 2045 expect
-rw-r--r-- 238 post
-rw-r--r-- 232 pre