[ANN][PLUGIN] external merge

[Wouter Bolsterlee]

På Sun, Feb 19, 2006 at 09:35:16AM -0600, John A Meinel skrev:
> > The external tool called can be set in bazaar.conf, if not set, it
> > will try kdiff3, xxdiff and opendiff in that order.
> 
> Actually, though it is more designed for 2-way diffing, vimdiff will
> accept multiple targets (I've certainly done 3 before).

Vim is limited to 4 simultaneous diff buffers. Suffices for manual 3-way
mergng.

  mvrgr, Wouter

-- 
:wq                                                       mail uws at xs4all.nl
                                                      web http://uwstopia.nl

i had no choice :: but to hear you                       -- alanis morisette
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060219/5146b533/attachment.pgp