comparison mercurial/templates/map-cmdline.compact @ 45347:1aef38d973e8

merge: pass mergeresult obj in _forgetremoved() (API) Instead of returning a dict of actions and then updating it, let's pass the object directly and update it there. This makes `updateactions()` on mergeresult unused and this patch removes that. After this patch, we have couple of methods left on mergeresult class which still exposes the internal dict based action storage. Differential Revision: https://phab.mercurial-scm.org/D8889
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 05 Aug 2020 16:52:51 +0530
parents f4aeb952ab77
children
comparison
equal deleted inserted replaced
45346:3c783ff08d40 45347:1aef38d973e8