Fix for checkout —theirs or checkout —ours not working if theirs or ours was a deleted node.