update
added alias, include meld as default git mergetool