add merge tool configuration to gitconfig