using meld for mergetool; liquidprompt for cli