merge-recursive: adjust to loosened "working file clobbered" check
[gitweb.git] / contrib / vim /
drwxr-xr-x   parent (dest: contrib; base: 65ac6e9)
-rw-r--r-- 360 README
drwxr-xr-x - syntax