Comment 0 for bug 143977

Currently there's no any method how to resolve .moved directories created by merge.
What do you suggest user to do, if she create the same directory with the same or similar files in two diverged branches and will try to merge them?
The best solution I can think of is the command "resolve --merge <directory>".

(How to reproduce - https://bugs.launchpad.net/bugs/34956)