Add new test case to ensure git-merge reduces octopus parents when possible