comparison mercurial/wireprototypes.py @ 45287:4ad6c4e9e35f

merge: pass mergeresult instead of actions in _checkunknownfiles() (API) Differential Revision: https://phab.mercurial-scm.org/D8825
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 24 Jul 2020 17:57:23 +0530
parents 9d2b2df2c2ba
children 89a2afe31e82
comparison
equal deleted inserted replaced
45286:00e9c5edcd58 45287:4ad6c4e9e35f