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