[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-devel] [PATCH] add kdiff3 support as a merge tool
|
From: |
rghetta |
|
Subject: |
[Monotone-devel] [PATCH] add kdiff3 support as a merge tool |
|
Date: |
Mon, 09 May 2005 07:52:03 +0200 |
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!
As usual, comments welcomed.
Riccardo
kdiff3_lua.diff
Description: Text Data
- [Monotone-devel] [PATCH] add kdiff3 support as a merge tool,
rghetta <=