mergetool: Don't error out in the merge case where the local file is deleted