Q: bzr-explorer external mereg

[David Muir]

I too would like to know the best practice here.
I've got extmerge installed, but I can't remember if bzr-explorer 
utilises it, or if it actually causes conflicts. All I know is that I 
typically get errors whenever I try to resolve conflicts via 
bzr-explorer, unless I invoke it by right-clicking on the file in the 
working tree panel and select "Merge conflict". I suppose that implies 
the problem might not be with explorer, per-se, but rather qconflicts.

Cheers,
David

Maritza Mendez wrote:
>
> Is bzr-extmerge required to use bzr-explorer's built-in GUI-based user 
> configuration for external merge tools?
>
> I seem to recall that bzr-explorer has it's own way of supporting 
> external merge tools without needing bzr-extmerge.
>
> But I notice that when I set an external merge app in the bzr-explorer 
> gui, it shows up in my bazaar.conf file.
>
> I'm perfectly happy using bzr-extmereg from the command-line but I'd 
> like to know the preferred practice for bzr-explorer.
>
> [Thanks.  I've been out of the loop for a while.]
>
> ~M