Teach 'git merge' that some merge strategies no longer exist