On Friday 26 February 2010 18:47:40 Alex Schuster wrote: > > What's a suitable substitute? > > Whatever you like. Just edit the MERGETOOL definition in /etc/cfg- > update.conf: > > # +----------+ > # | MERGETOOL \ > # > +------------+------------------------------------------------------- > ----+ # |The recommended tool for merging is beediff but you can also > use other| # |tools if you don't like beediff. The Supported tools > are listedbelow:| # > +----------+-----+--------------------------+----------------------- > ---+ # | beediff | GUI | QT | > | # | kdiff3 | GUI | KDE (or Gnome with QT) | > | # | meld | GUI | Gnome (or KDE with GTK) | > | # | gtkdiff | GUI | Gnome (or KDE with GTK) > | STAGE 3 not supported! | # | gvimdiff | GUI | Gnome (or KDE with > GTK) | STAGE 3 not supported! | # | tkdiff | GUI | Gnome (or > KDE with TK) | | # | vimdiff | CLI | > Systems without X | STAGE 3 not supported! | # | sdiff | > CLI | Systems without X | STAGE 3 not supported! | # | > imediff2 | CLI | Systems without X | STAGE 3 not supported! > | > +----------+-----+--------------------------+----------------------- > -----+ MERGE_TOOL = /usr/bin/kdiff3
OK. Thanks. I'll try kdiff3. -- Rgds Peter.
