git merge: reword failure message.
[gitweb.git] / contrib /
drwxr-xr-x   parent (dest: ; base: 0c4e95d083f77de03a64b65f5633ed0ba082a26e)
-rw-r--r-- 2114 README
drwxr-xr-x - colordiff
drwxr-xr-x - completion
drwxr-xr-x - emacs
drwxr-xr-x - gitview
-rw-r--r-- 1484 mailmap.linux
-rw-r--r-- 770 remotes2config.sh
drwxr-xr-x - vim