Updated gitconfig with mergetool.