Add a second testcase for handling invalid strategies in git-merge