1. didn't you - agree with with the main verb "said" in the sentence. 2. Both answers are acceptable, but each carries a different meaning. To clarify the meaning, you'd better answer in these ways: - I will leave tomorrow. - I said so/that yesterday.