{"thread":{"id":"14457","subject":"git-mergetool + WinMerge","startedAt":"2008-07-15T02:55:46Z","lastAt":"2008-07-15T21:51:39Z","messageCount":2,"participants":["chongyc","Steffen Prohaska"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"83343","messageId":"59f9aa2d-75f2-493d-8f83-1a5fcb24a889@34g2000hsh.googlegroups.com","threadId":"14457","inReplyTo":null,"subject":"git-mergetool + WinMerge","fromName":"chongyc","fromEmail":"chongyc27@gmail.com","sentAt":"2008-07-15T02:55:46Z","receivedAt":"2008-07-15T02:55:46Z","isPatch":false,"sender":{"key":"chongyc27@gmail.com","avatar":"https://gravatar.com/avatar/2e4e0f376f8474fd86c1466c95384d836fd7ffaef0aa8d0b87188ff8562d6f52?d=mp&s=160"},"body":"Hi everybody\n\nI am going to merge conflict by using git-mergetool of msysgit(for\nwindows) and Winmerge.\n\nwhat shall i do?\n\nHelp me\n"},{"id":"83438","messageId":"D6807A06-2C86-45AB-8A62-FFFC62448293@zib.de","threadId":"14457","inReplyTo":"59f9aa2d-75f2-493d-8f83-1a5fcb24a889@34g2000hsh.googlegroups.com","subject":"Re: git-mergetool + WinMerge","fromName":"Steffen Prohaska","fromEmail":"prohaska@zib.de","sentAt":"2008-07-15T21:51:39Z","receivedAt":"2008-07-15T21:51:39Z","isPatch":false,"sender":{"key":"prohaska@zib.de","avatar":"https://avatars.githubusercontent.com/u/217580?v=4"},"body":"\nOn Jul 15, 2008, at 4:55 AM, chongyc wrote:\n\n> I am going to merge conflict by using git-mergetool of msysgit(for\n> windows) and Winmerge.\n>\n> what shall i do?\n\nIf you have already read the documentation of \"git mergetool\", see\n\nhttp://www.kernel.org/pub/software/scm/git/docs/git-mergetool.html\n\nwhat is your specific question?\n\n\tSteffen\n"}]}