This commit message led me in the wrong direction because the merge was failing when merge wanted to modify a dirty file. What you wanted to do is to a the same test for the checkout-from-theirs case.