Correctly handle the absence of one version of in a merge

Closes #1217.
Merge pull request #1219 from vanicat/t/ediff-merge

Correctly handle the absence of one version of in a merge