Add builtin merge-file, a minimal replacement for RCS merge
[gitweb.git] / contrib / vim / syntax /
drwxr-xr-x   parent (dest: contrib/vim; base: ba1f5f3537)
-rw-r--r-- 801 gitcommit.vim