I am using cygwin git and I was struggling to use meld as my favorite mergetool.
I was unable to run meld which was installed in cygwin, so installed in windows instead at:
My ~/.gitconfig had this setting, but says file not found when i run git mergetool.
So ended up removing meld from cygwin and symlink windows meld like this:
Changed .gitconfig to:
Then I was successfully able to use meld as a git merge tool. Only thing it still doesn't work is when i try to use it from windows cmd. So just for git merge tool, i have to open cygwin bash :(
Let me know if you know a good solution that will work on both bash (cygwin & windows)
I was unable to run meld which was installed in cygwin, so installed in windows instead at:
C:\Program Files (x86)\Meld\Meld.exe
My ~/.gitconfig had this setting, but says file not found when i run git mergetool.
[merge] tool = meld [mergetool "meld"] path = "C:\Program Files (x86)\Meld\Meld.exe"
So ended up removing meld from cygwin and symlink windows meld like this:
$ cd /usr/bin/ $ ln -s "C:\Program Files (x86)\Meld\Meld.exe" meld
Changed .gitconfig to:
[merge] tool = meld [mergetool "meld"] path = /usr/bin/meld
Then I was successfully able to use meld as a git merge tool. Only thing it still doesn't work is when i try to use it from windows cmd. So just for git merge tool, i have to open cygwin bash :(
Let me know if you know a good solution that will work on both bash (cygwin & windows)
No comments:
Post a Comment