Comment 4 for bug 143977

>Please see "bzr help conflicts". Resolving a filename conflict requires human intelligence.
Sorry, but so what? :)
Sometimes this intelligence is to merge old .moved directory with newly created.
Join all files inside, as they are in fact different versions of the same folder.
Intelligence is only to say that directories are actually the same directory.
"If you wish, you can rename either one of these files, or combine their contents. " (from docs)
How do I combine their contents?
I would like to be able to transform path conflict to content conflict(s).
Or else I will have to use command line diff for them instead of my editor features and 3-way diff!

p.s. Maybe amend bug title a bit? Seems current one confused you.