git-revert with conflicts to behave as git-merge with conflicts
[gitweb.git] / contrib / colordiff /
drwxr-xr-x   parent (dest: contrib; base: a9cb3c6e)
-rw-r--r-- 124 README
-rwxr-xr-x 6250 colordiff.perl