Fix rebase/merge inclusion of deleted file.