Update gitconfig to use diffmerge