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