[ANN][PLUGIN] external merge

Martin Pool mbp at sourcefrog.net
Mon Feb 20 05:06:32 GMT 2006


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'.

-- 
Martin

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060220/ece467bf/attachment.pgp 


More information about the bazaar mailing list