git-merge-recursive: learn to honor merge.conflictstyle
[gitweb.git] / contrib / vim / syntax /
drwxr-xr-x   parent (dest: contrib/vim; base: c236bcd06138bcbc929b86ad1a513635bf4847b2)
-rw-r--r-- 798 gitcommit.vim