This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
After installing it http://sourceforge.net/projects/meld-installer/ | |
I had to tell git where it was: | |
git config --global merge.tool meld | |
git config --global diff.tool meld | |
git config --global mergetool.meld.path “C:\Program Files (x86)\Meld\meld\meld.exe” | |
And that seems to work. Both merging and diffing with “git difftool” or “git mergetool” |