Add diff and mergetool to git aliases