Remove uncontested renamed files during merge.
[gitweb.git] / contrib / vim / syntax /
drwxr-xr-x   parent (dest: contrib/vim; base: 8371234ecaaf6e14fe3f2082a855eff1bbd79ae9)
-rw-r--r-- 801 gitcommit.vim