rebase -i -p: Fix --continue after a merge could not be redone