[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] [PATCH] add kdiff3 support as a merge tool
|
From: |
Nathaniel Smith |
|
Subject: |
Re: [Monotone-devel] [PATCH] add kdiff3 support as a merge tool |
|
Date: |
Mon, 9 May 2005 22:07:22 -0700 |
|
User-agent: |
Mutt/1.5.9i |
On Mon, May 09, 2005 at 07:52:03AM +0200, rghetta wrote:
> This patch makes kdiff3 the default merge tool, instead of meld.
>
> rationale:
> Meld is nice on two-way merge, but much less satisfactory for three-way.
> kdiff3 hasn't all the features of xxdiff, but is multiplatform (*nix,
> win32, osx) and support editing the merged file!
Merged on mainline. Thanks!
-- Nathaniel
--
"The problem...is that sets have a very limited range of
activities -- they can't carry pianos, for example, nor drink
beer."