| 1 |
On Friday 26 February 2010 18:47:40 Alex Schuster wrote: |
| 2 |
|
| 3 |
> > What's a suitable substitute? |
| 4 |
> |
| 5 |
> Whatever you like. Just edit the MERGETOOL definition in /etc/cfg- |
| 6 |
> update.conf: |
| 7 |
> |
| 8 |
> # +----------+ |
| 9 |
> # | MERGETOOL \ |
| 10 |
> # |
| 11 |
> +------------+------------------------------------------------------- |
| 12 |
> ----+ # |The recommended tool for merging is beediff but you can also |
| 13 |
> use other| # |tools if you don't like beediff. The Supported tools |
| 14 |
> are listedbelow:| # |
| 15 |
> +----------+-----+--------------------------+----------------------- |
| 16 |
> ---+ # | beediff | GUI | QT | |
| 17 |
> | # | kdiff3 | GUI | KDE (or Gnome with QT) | |
| 18 |
> | # | meld | GUI | Gnome (or KDE with GTK) | |
| 19 |
> | # | gtkdiff | GUI | Gnome (or KDE with GTK) |
| 20 |
> | STAGE 3 not supported! | # | gvimdiff | GUI | Gnome (or KDE with |
| 21 |
> GTK) | STAGE 3 not supported! | # | tkdiff | GUI | Gnome (or |
| 22 |
> KDE with TK) | | # | vimdiff | CLI | |
| 23 |
> Systems without X | STAGE 3 not supported! | # | sdiff | |
| 24 |
> CLI | Systems without X | STAGE 3 not supported! | # | |
| 25 |
> imediff2 | CLI | Systems without X | STAGE 3 not supported! |
| 26 |
> | |
| 27 |
> +----------+-----+--------------------------+----------------------- |
| 28 |
> -----+ MERGE_TOOL = /usr/bin/kdiff3 |
| 29 |
|
| 30 |
OK. Thanks. I'll try kdiff3. |
| 31 |
|
| 32 |
-- |
| 33 |
Rgds |
| 34 |
Peter. |
Archives