Odisha CM Majhi expects resolution of the Mahanadi water dispute with Chhattisgarh before Diwali, following a tripartite meeting aimed at negotiation.