Be more user-friendly when refusing to do something because of conflict.
[gitweb.git] / t / t9150 /
drwxr-xr-x   parent (dest: t; base: d38a30df7dd54c5c6883af1de1a03ec7d523cee5)
-rw-r--r-- 1185 make-svk-dump
-rw-r--r-- 15522 svk-merge.dump