Find here my .gitconfig settings that I used with git to make use of the meld tool as my difftool and mergetool.
This code is used on the Linux Ubuntu platform.
[diff]
tool = meld
[merge]
tool = meld
[mergetool "meld"]
# Choose one of these 2 lines (not both!)
cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
#cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
[difftool "meld"]
cmd = meld "$LOCAL" "$REMOTE"
This code is used on the Windows platform
[merge]
tool = meld
[mergetool "meld"]
cmd = \"C:/Program Files (x86)/Meld/Meld.exe\" $LOCAL $MERGED $REMOTE --output $MERGED
path = C:/Program Files (x86)/Meld/Meld.exe
[diff]
tool = meld
guitool = meld
[difftool]
prompt = false
[difftool "meld"]
cmd = \"C:/Program Files (x86)/Meld/Meld.exe\" \"$LOCAL\" \"$REMOTE\"
path = C:/Program Files (x86)/Meld/Meld.exe
Hope this help