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