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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html