Jeff King <peff@xxxxxxxx> writes: > I was thinking the same thing. And it seems this came up once before, > and the list seemed to favor special-casing merge-recursive (but not > diffcore): > > http://thread.gmane.org/gmane.comp.version-control.git/116917/focus=117082 Yeah, thanks for digging up the old thread. I was looking at the patch to merge-recursive from Dscho on that thread and I think it identified the place that needs patching correctly. I was on a tablet, without the access to the surrounding code outside the patch context, so I do not know if the logic to detect the pure-rename of an empty file in the patch was correct, or the patch still applies to the current codebase, though. -- 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