[ANN][PLUGIN] external merge

[Erik Bågfors]

2006/2/20, Martin Pool <mbp at sourcefrog.net>:
> On Sat, 2006-02-18 at 16:10 +0100, Erik Bågfors wrote:
> > Hi
> >
> > I just created a small plugin that calls an external merge tool to
> > help you resolve conflicts.
> >
> > It works like this
> >
> > $ bzr merge
> > opps, conflicts
> > $ bzr extmerge --all
> >
> > The tool will be called once for each file that conflicts.  You can
> > also call it with "bzr extmerge file".
>
> Perhaps we could have this behaviour builtin as say 'bzr merge
> --interactive', or automatically turned on by a user preference?  It
> could also be called from say 'bzr remerge --interactive'.

I'm fine with that. What darcs does is have it automatically turned on
by a user preference, but darcs doesn't provide a way to do it AFTER
the merge.  If I remember correctly, darcs also commits the resolution
for you automatically.  This has annoyed me, since I prefer to be able
to review it.

If people which to have it automatically, and/or with --interactive
flags, Please tell me and I'll integrate it into a branch.

With John's input I should also be able to make it work with meld and
vimdiff as well.

Regards,
Erik