diff CONTRIBUTORS @ 45286:00e9c5edcd58

merge: pass mergeresult obj instead of actions dict in _resolvetrivial() Differential Revision: https://phab.mercurial-scm.org/D8824
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 24 Jul 2020 17:52:33 +0530
parents c29efd272395
children
line wrap: on
line diff