git-merge-recursive: learn to honor merge.conflictstyle
[git] / t / t4020 /
drwxr-xr-x   ..
-rw-r--r-- 116 diff.NUL