merge, pull: stop advising 'commit -a' in case of conflict
[git/git-svn.git] / t / t9111 / 
tree2e7d14d3721cde04c4426c2ef2612b5bc1b2c273
drwxr-xr-x   ..
-rw-r--r-- 7223 svnsync.dump