>> 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? - Sabyasachi -- 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