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

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.

-- Hannes