Keep rename/rename conflicts of intermediate merges while doing recursive merge
[gitweb.git] / contrib / vim /
drwxr-xr-x   parent (dest: contrib; base: a97e4075a16e0cbdf9c4aed736b5e762e035508b)
-rw-r--r-- 360 README
drwxr-xr-x - syntax