or
or
In this question "did" indicates that it’s past form. So, the next gap also will take the past form. Both sides are same.
In the answers board, we can see only "till he came" is in the past form. That's the correct answer.
