diff mercurial/exchange.py @ 45285:e7196f1da2b1

merge: pass mergeresult obj instead of actions in _filternarrowactions() We want to use rich mergeresult object and it's APIs instead of handling a dictionary. Differential Revision: https://phab.mercurial-scm.org/D8823
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 24 Jul 2020 17:49:13 +0530
parents 6063c1857d0a
children e58e234096de
line wrap: on
line diff