A similar question was already asked, but for Ubuntu.
It would help to know if the tool is free as in beer or as in liber.
Also, up and downs of the tool would be nice to know.
Share
Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
A similar question was already asked, but for Ubuntu.
It would help to know if the tool is free as in beer or as in liber.
Also, up and downs of the tool would be nice to know.
On Windows, a good 3-way diff/merge tool remains kdiff3 (WinMerge, for now, is still 2-way based, pending WinMerge3)
See “How do you merge in GIT on Windows?” and this config.
Update 7 years later (Aug. 2018): Artur Kędzior mentions in the comments:
If you guys happen to use Visual Studio (Community Edition is free), try the tool that is shipped with it:
vsDiffMerge.exe. It’s really awesome and easy to use.