merge-recursive: adjust to loosened "working file clobbered" check
[gitweb.git] / contrib /
drwxr-xr-x   parent (dest: ; base: 65ac6e9c3f47807cb603af07a6a9e1a43bc119ae)
-rw-r--r-- 2114 README
drwxr-xr-x - colordiff
drwxr-xr-x - completion
drwxr-xr-x - emacs
drwxr-xr-x - gitview
-rw-r--r-- 770 remotes2config.sh
drwxr-xr-x - vim