Hi everybody I am going to merge conflict by using git-mergetool of msysgit(for windows) and Winmerge. what shall i do? Help me -- 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
