Resolving conflicts with Bazaar Explorer

[Gordon Tyler]

DeeJay wrote:
> There is a blog entry about it here -
> http://bazaarvcs.wordpress.com/2009/11/08/new-working-tree-features-in-qbzr/

Although that's qbzr, not Explorer (v0.9.0). Explorer's Conflicts window 
still doesn't handle it correctly. It only gives the BASE, THIS and 
OTHER file to kdiff3, it doesn't give the output file (i.e. original), 
so when you save your merge in kdiff3, it goes into the OTHER file and 
you have to copy that over the original to get the conflict resolved.

 From the qcommit window, selecting Merge conflict invokes kdiff3 correctly.