Hi, On Sat, 17 Jan 2009, Damon LaCrosse wrote: > any chances the attached patch reveals a git bug? You mean that it produces a merge conflict when a file was modified in one branch, and deleted in the other? Because that's what you did, basically. You did not rename file1 to file2. You completely changed the contents. I mean, completely. 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
