On Fri, Jun 25, 2010 at 11:06:46AM +0530, Sabyasachi Ruj wrote: > >> So I think there may be a bug. I don't really see any code in > >> merge-recursive.c to handle conflicts on _both_ sides of a rename, but > >> obviously that is possible here. > > Then I guess having contents of both the files would be an expected > behavior. Should I report a bug somewhere? I would certainly expect it (at least in the index). Posting here is fine to report, but you may want to repost with a more descriptive subject line and a summary of the issue. That will get the attention of people interested in merge issues. -Peff -- 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