git-merge-recursive: learn to honor merge.conflictstyle
[git] / contrib / vim /
drwxr-xr-x   ..
-rw-r--r-- 360 README
drwxr-xr-x - syntax