Q: bzr-explorer external mereg

[Gary van der Merwe]

On Wed, Jun 16, 2010 at 5:14 AM, Maritza Mendez <martitzam at gmail.com> 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

qconfilicts does not use extmerge

The qbzr tree widget (used in bzr-explorer, qcommit, and qbrowse) does
use extmerge.

This is a bit of a mess. I would like for qconfilicts to use the tree
widget. I would also like to include the extmerge functionality in
either qbzr or bzr core, so that extmerge is no longer required.

But this is on hold will I finish the threads branch.

Gary