git-merge-recursive: learn to honor merge.conflictstyle
[git] / t / t9700 /
drwxr-xr-x   ..
-rwxr-xr-x 4172 test.pl