.gitconfig : Modified for diffmerge as default git mergetool