Re: Mergetool generating blank files (1.5.3)
- From
Theodore Tso <tytso@mit.edu>
- Date
- Sep 27, 2007, 22:23 UTC
- Message-ID
- <20070927222326.GB8688@thunk.org>
- In-Reply-To
- <20070927191125.GD12427@artemis.corp>
On Thu, Sep 27, 2007 at 09:11:25PM +0200, Pierre Habouzit wrote:
Show 10 quoted lines
> > > And as none of the other merge tool that are supported are able to > > > either do 3way merges, or have a decent UI (that definitely seems to be > > > exclusive features) I've given up on git-mergetool (and to be fair, it > > > sucks, because it could be _sooo_ useful sometimes). > > > > > > > What about meld? That does 3-way merge, and the UI is fine. > > Indeed, it seems that since the last time I tested it, it now does > diff3 merging. I should reevaluate it :)
Pierre,
FYI, kdiff3, meld, xxdiff, opendiff (on MacOSX), and emerge all support 3-way merge.
- Ted