I want to use meld as my diff tool for git.
If I configure my .gitconfig
like this :
[difftool]
prompt = false
[diff]
tool = meld
I fixed my problem by removing meld and use a new version (3.12.3) of it:
sudo apt-get remove meld
Now my .gitconfig
is like :
[difftool]
prompt = false
[diff]
tool = meld
guitool = meld
[difftool "meld"]
path = /home/me/App/meld/meld-3.12.3/bin/meld
And the result from the folowing commands are :
git diff
: terminal diff of each modified filesgit diff <myfile>
: terminal diff of <myfile>
git difftool <myfile>
: meld diff of <myfile>
git difftool
: meld diff of each modified files, one bye onegit difftool -d
: meld diff of each file, into a single windowI have also add this line to my bash_alias
but I think it could work without.
alias meld='/home/benjamin/Applications/meld/meld-3.12.3/bin/meld'