From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 03 Mar 2007 20:44:16 GMT
Subject: Re: [PATCH 1/2] Handle core.symlinks=false case in merge-recursive.
Message-ID: <Pine.LNX.4.63.0703032143350.22628@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <200703032139.12869.johannes.sixt@telecom.at>

Hi,

On Sat, 3 Mar 2007, Johannes Sixt wrote:

> On Saturday 03 March 2007 21:11, Johannes Schindelin wrote:
> > I think regardless of the value of core.symlinks, merging symbolic 
> > links does not make sense at all.
> 
> No doubt about that. Currently, the version of the "current" branch 
> remains in the working tree. My patch does not change this behavior at 
> all, it just does not call symlink(2), but allocates a regular file.

Oh, I misunderstood! All is well, then. (I had the impression you put 
conflict markers into the file.)

Ciao,
Dscho