Yeah but the Deinotherium was very tall and could lift its head and and stab the mammoth although it would be a tough fight I think unless the Deinotherium played it out perfectly (which is in likely) the mammoth would most likely win.
So my answer? Mammoth