Former adversaries say they will settle differences as fears grow of expanding war in Ethiopia.