We'll still have problems if we have a deleted file that remote changed
instead of removed.

This is hopefully easy to fix (just add an else: to the "remote changed,
local deleted" prompt), but I'm still not sure there are other such cases.