git-am --resolved: more usable error message.
[gitweb.git] / contrib /
drwxr-xr-x   parent (dest: ; base: c1d1128)
-rw-r--r-- 2114 README
drwxr-xr-x - emacs
drwxr-xr-x - git-svn
drwxr-xr-x - gitview