merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[gitweb.git] / contrib / vim / syntax /
drwxr-xr-x   parent (dest: contrib/vim; base: b541248)
-rw-r--r-- 798 gitcommit.vim