Mercurial > hg
diff CONTRIBUTING @ 45333:f569ca3eb430
merge: pass mergeresult obj instead of actions in _checkcollision() (API)
The goal is to not use the actions dict and replace it with a rich mergeresult
object.
Differential Revision: https://phab.mercurial-scm.org/D8875
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Mon, 03 Aug 2020 13:30:14 +0530 |
parents | a492610a2fc1 |
children |