Gerrit Pape <pape@xxxxxxxxxxx> writes: > On Sat, Jul 07, 2007 at 09:58:08PM +0100, Johannes Schindelin wrote: >> On Mon, 25 Jun 2007, Gerrit Pape wrote: >> > Hi, did you get to this yet?, not to stress you, just to make sure we >> > don't forget about it. >> >> Okay. Since now both you and Junio asked for it, and I made today a Git >> day for me, I looked into this. > > Hi, the discussion on this topic unfortunately didn't result in a patch. I know. Unfortunately the code structure in merge-recursive around directory-file conflict handling needs major surgery to fix this, and it won't be until somebody really sits down and rethink the issue. I've been quietly working on some ideas and a small nascent part of it is in 'pu' (or 'offcuts', perhaps, I do not remember offhand), but it will take time. - 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
