added merge tool to gitconfig