| changed conflict --> __change___ > > As a result, the user thinks that the only __change__ is the import > statement, and elects to resolve the commit in favour of the local > commit. This is the wrong thing to do because the remote hunk is then > lost to the history. > -- 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