What's a good (free) visual merge tool for Git? (on windows)

windows git version-control merge
Tal Galili picture Tal Galili · Aug 29, 2011 · Viewed 150.6k times · Source

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.

Answer

VonC picture VonC · Aug 29, 2011

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.

Related questions

Git clone / pull continually freezing at "Store key in cache?"

I'm attempting to clone a repo from my BitBucket account to my Windows 10 laptop (running GitBash). I've completed all of the steps necessary to connect (set up my SSH key, verified by successfully SSHing [email protected], etc). However, whenever …

Read More
Git pre-commit hook not running on windows

I'm just starting to look into Git hooks, but I can't seem to get them to run. I set up a local repository, so there is now a '.git' directory in my project folder. I have added a '.…

Read More
Add Github remote to GitKraken

I'm using GitKraken (v. 1.4.1) as my Git managing tool. And now I want to use Github as a remote to back up my repos. But when I click on add remote and try to add a Github repo, it just …

Read More