t / test4012.pngon commit Add a second testcase for handling invalid strategies in git-merge (dce61e7)
t/test4012.png