i will tell you that all he told

I will tell you all he told me.
that去掉,如果有它的话后面要接从句而不是短语“all he told me".
或者I will tell you what he told me.