| 1 |
Peter Humphrey writes: |
| 2 |
|
| 3 |
> I'm still using etc-update, which seems adequate except when squid is |
| 4 |
> upgraded, but I thought I'd try cfg-update. Problem though: it demands |
| 5 |
> dev-util/xxdiff which doesn't exist. What's a suitable substitute? |
| 6 |
|
| 7 |
Whatever you like. Just edit the MERGETOOL definition in /etc/cfg- |
| 8 |
update.conf: |
| 9 |
|
| 10 |
# +----------+ |
| 11 |
# | MERGETOOL \ |
| 12 |
# |
| 13 |
+------------+-----------------------------------------------------------+ |
| 14 |
# |The recommended tool for merging is beediff but you can also use other| |
| 15 |
# |tools if you don't like beediff. The Supported tools are listedbelow:| |
| 16 |
# +----------+-----+--------------------------+--------------------------+ |
| 17 |
# | beediff | GUI | QT | | |
| 18 |
# | kdiff3 | GUI | KDE (or Gnome with QT) | | |
| 19 |
# | meld | GUI | Gnome (or KDE with GTK) | | |
| 20 |
# | gtkdiff | GUI | Gnome (or KDE with GTK) | STAGE 3 not supported! | |
| 21 |
# | gvimdiff | GUI | Gnome (or KDE with GTK) | STAGE 3 not supported! | |
| 22 |
# | tkdiff | GUI | Gnome (or KDE with TK) | | |
| 23 |
# | vimdiff | CLI | Systems without X | STAGE 3 not supported! | |
| 24 |
# | sdiff | CLI | Systems without X | STAGE 3 not supported! | |
| 25 |
# | imediff2 | CLI | Systems without X | STAGE 3 not supported! | |
| 26 |
+----------+-----+--------------------------+----------------------------+ |
| 27 |
MERGE_TOOL = /usr/bin/kdiff3 |
| 28 |
|
| 29 |
Wonko |
Archives