This is what I use in my ~/.gitconfig:

    [difftool "meld"]
      cmd = meld "$LOCAL" "$REMOTE"
    [mergetool "meld"]
      cmd = meld --auto-merge --output "$MERGED" "$LOCAL" "$BASE" "$REMOTE"