comparison mercurial/cmdutil.py @ 45300:f4a2b329717b

merge: move conversion of file-key dict to action-key dict in mergeresult Initially the actions dict which we get has file has keys, but later we want a dict which has actions as keys. This patch moves code computing that to mergeresult class as that's where it should be anyway. Differential Revision: https://phab.mercurial-scm.org/D8817
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 24 Jul 2020 14:45:00 +0530
parents 8cce9f77ca73
children e58e234096de
comparison
equal deleted inserted replaced
45299:0c849f0166c2 45300:f4a2b329717b