adding meld support to git diff/merge