Be more user-friendly when refusing to do something because of conflict.
[git] / t / t9150 /
drwxr-xr-x   ..
-rw-r--r-- 1185 make-svk-dump
-rw-r--r-- 15522 svk-merge.dump