From: Jakub Narebski <jnareb@gmail.com>
Date: Wed, 18 Oct 2006 09:35:28 GMT
Subject: Re: [PATCH] Use diff3 instead of merge in merge-recursive.
Message-ID: <eh4sfr$3ej$1@sea.gmane.org>
In-Reply-To: <20061018085949.GA26501@cepheus.pub>

Uwe Zeisberger wrote:

> If no error occurs, merge (from rcs 5.7) is nothing but:
> 
>         diff3 -E -am -L label1 -L label2 -L label3 file1 file2 file3 > tmpfile
>         cat tmpfile > file1
> 
> Using diff3 directly saves one fork per conflicting file.

Doesn't xdiff library git uses have diff3/merge equivalent?
Couldn't we use that instead (on less dependency, better performance)?
-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git