merge vimrc and set difftool in gitconfig