From: Peter Humphrey <peter@humphrey.ukfsn.org>
To: gentoo-user@lists.gentoo.org
Subject: Re: [gentoo-user] How should I clean up my broken system?
Date: Sat, 27 Feb 2010 01:02:33 +0000 [thread overview]
Message-ID: <201002270102.33542.peter@humphrey.ukfsn.org> (raw)
In-Reply-To: <201002261947.41630.wonko@wonkology.org>
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.
next prev parent reply other threads:[~2010-02-27 1:03 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-12 19:55 [gentoo-user] How should I clean up my broken system? Alan Mackenzie
2010-02-12 19:55 ` Volker Armin Hemmann
2010-02-12 21:21 ` Kyle Bader
2010-02-12 22:52 ` Neil Bothwick
2010-02-13 7:28 ` Alan McKinnon
2010-02-13 20:43 ` Neil Bothwick
2010-02-14 6:01 ` Alan McKinnon
2010-02-14 9:34 ` Neil Bothwick
2010-02-14 11:03 ` Volker Armin Hemmann
2010-02-14 11:32 ` Neil Bothwick
2010-02-20 12:08 ` Mick
2010-02-20 12:20 ` Volker Armin Hemmann
2010-02-21 0:22 ` Neil Bothwick
2010-02-21 3:12 ` Iain Buchanan
2010-02-22 11:29 ` daid kahl
2010-02-22 13:56 ` Volker Armin Hemmann
2010-02-22 17:06 ` [gentoo-user] " Harry Putnam
2010-02-26 7:29 ` daid kahl
2010-02-26 18:20 ` [gentoo-user] " Peter Humphrey
2010-02-26 18:47 ` Alex Schuster
2010-02-27 1:02 ` Peter Humphrey [this message]
2010-02-12 23:46 ` William Kenworthy
2010-02-13 7:27 ` Alan McKinnon
2010-02-13 17:51 ` Alan Mackenzie
2010-02-13 18:50 ` Stroller
2010-02-14 6:00 ` Alan McKinnon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201002270102.33542.peter@humphrey.ukfsn.org \
--to=peter@humphrey.ukfsn.org \
--cc=gentoo-user@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox