fix proxy url
add Meld for git mergetool and difftool