☰

What's a good (free) visual merge tool for Git? (on windows) [closed] Ask Question

tag-icon • tag-icon windows git version-control merge
What's a good (free) visual merge tool for Git? (on windows) [closed] Ask Question

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.

ベストアンサー1

I've also used Meld. It's written in python. There is an official installer for Windows that works well.

Install it and then set it as your default mergetool.

$ git config --global merge.tool "meld"
$ git config --global mergetool.meld.path "C:\Program Files (x86)\Meld\Meld.exe"

If using a GUI GIT client, try the following (instructions for SourceTree, adjust accordingly)

  • In SourceTree, go to Tools/Options/Diff
  • In External Diff Tool, choose Custom
  • Enter C:\Program Files (x86)\Meld\meld.exe in Diff Command and $LOCAL $REMOTE in Arguments
  • In Merge Tool, choose Custom
  • Enter C:\Program Files (x86)\Meld\meld.exe in Diff Command and $LOCAL $MERGED $REMOTE in Arguments

おすすめ記事