merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[git] / t / t9700 /
drwxr-xr-x   ..
-rwxr-xr-x 4172 test.pl