On Jul 15, 2008, at 4:55 AM, chongyc wrote:
I am going to merge conflict by using git-mergetool of msysgit(for windows) and Winmerge. what shall i do?
If you have already read the documentation of "git mergetool", see http://www.kernel.org/pub/software/scm/git/docs/git-mergetool.html what is your specific question? Steffen -- 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
