merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[gitweb.git] / t / t9700 /
drwxr-xr-x   parent (dest: t; base: b541248)
-rwxr-xr-x 4172 test.pl