From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 12 Feb 2008 23:48:06 GMT
Subject: Re: Merge-Recursive Improvements
Message-ID: <alpine.LFD.1.00.0802121544370.2920@woody.linux-foundation.org>
In-Reply-To: <A21B3CA8-6240-434F-87A9-C6F76DA15265@gmail.com>



On Tue, 12 Feb 2008, Voltage Spike wrote:
> 
> First, git is overly zealous at merging differences and two functions added
> at the same point in a file become intertwined during the merge. A trivial
> example of this behavior:

Hmm. Have you tested what happens if you use XDL_MERGE_EAGER instead of 
XDL_MERGE_ZEALOUS in the "level" argument to xdl_merge() in 
merge-recursive.c?

(No, I didn't test it myself, but it may get you the behaviour you want, 
and we could make it a config option for people who want a less aggressive 
merge)

			Linus