Comment 5 for bug 344013

This bug affects me as user of bzr-colo: while working with bzr colo I switch between feature branches all the time. Therefore I often get this problem with conflicted directory deletions because my editor of choice configured to left special config file in the current directory where I've invoked it. So after I've invoked my editor in newly created directory which exists only in one branch and then I switch to antoher branch in my colo workspace I get this conflict on switch. So I have to delete the directory manually and then `bzr resolve --all`. I'd happy if `bzr resolve` without options or arguments can do the right thing in my case.