git-revert with conflicts to behave as git-merge with conflicts
[gitweb.git] / contrib / vim / syntax /
drwxr-xr-x   parent (dest: contrib/vim; base: a9cb3c6e)
-rw-r--r-- 801 gitcommit.vim