Add mergeoptions to gitconfig