Merge branch 'jc/show-merge'
[gitweb.git] / contrib /
drwxr-xr-x   parent (dest: ; base: 868227b0d1f3a295ea9afe7a3be3a1fbdff62442)
-rw-r--r-- 2114 README
drwxr-xr-x - colordiff
drwxr-xr-x - emacs
drwxr-xr-x - gitview
-rw-r--r-- 770 remotes2config.sh