You could use complete unix paths like: PATH=$PATH:/c/python26 git config –global merge.tool meld git config –global mergetool.meld.path /c/Program files (x86)/meld/bin/meld This is what is described in “How to get meld working with git on Windows“ Or you can adopt the wrapper approach described in “Use Meld with Git on Windows“ # set up Meld as … Read more
Short & sweet: git config –global diff.tool meld This configures Git to use meld as the diff tool. (You don’t need to specify the command line arguments, support for meld is built into Git.) Then, if you want a graphical diff instead of a textual one, you simply invoke git difftool instead of git diff … Read more
Why do you not use git bash for Windows? After install meld simply: git config –global merge.tool meld git config –global mergetool.meld.path “C:\Program Files (x86)\Meld\Meld.exe” <- path to meld here Thats all!
It’s the one in the middle : BASE. In fact, BASE is not the common ancestor, but the half-finished merge where conflicts are marked with >>>> and <<<<. You can see the file names on the top of meld editing window. See the screenshot here You can edit the BASE file as you want with … Read more
How do I set up and use Meld as my git difftool? git difftool displays the diff using a GUI diff program (i.e. Meld) instead of displaying the diff output in your terminal. Although you can set the GUI program on the command line using -t <tool> / –tool=<tool> it makes more sense to configure … Read more