Update gitconfig with diff and merge configurations