From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1NlB5b-0004oD-Hy for garchives@archives.gentoo.org; Sat, 27 Feb 2010 01:03:27 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E098FE0B24; Sat, 27 Feb 2010 01:02:35 +0000 (UTC) Received: from mail.ukfsn.org (mail.ukfsn.org [77.75.108.10]) by pigeon.gentoo.org (Postfix) with ESMTP id B8E20E0AE0 for ; Sat, 27 Feb 2010 01:02:35 +0000 (UTC) Received: from localhost (smtp-filter.ukfsn.org [192.168.54.205]) by mail.ukfsn.org (Postfix) with ESMTP id D94FBDEBE4 for ; Sat, 27 Feb 2010 01:02:34 +0000 (GMT) Received: from mail.ukfsn.org ([192.168.54.25]) by localhost (smtp-filter.ukfsn.org [192.168.54.205]) (amavisd-new, port 10024) with ESMTP id VYqBG+Mo2mOL for ; Sat, 27 Feb 2010 01:02:34 +0000 (GMT) Received: from wstn.localnet (unknown [78.32.181.186]) by mail.ukfsn.org (Postfix) with ESMTP id 63DBFDEBD2 for ; Sat, 27 Feb 2010 01:02:34 +0000 (GMT) From: Peter Humphrey Organization: at home 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 User-Agent: KMail/1.13.0 (Linux/2.6.32-gentoo-r6; KDE/4.4.0; x86_64; ; ) References: <20100212195529.GD1560@muc.de> <201002261820.19536.peter@humphrey.ukfsn.org> <201002261947.41630.wonko@wonkology.org> In-Reply-To: <201002261947.41630.wonko@wonkology.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-user@lists.gentoo.org Reply-to: gentoo-user@lists.gentoo.org MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201002270102.33542.peter@humphrey.ukfsn.org> X-Archives-Salt: 4912bb85-9490-4967-b0f5-2d66002eb4db X-Archives-Hash: 0e50d3eea8b38e05a8eee1da6095465e 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.