Allow git-merge to select the default strategy.