Mercurial > hg
comparison mercurial/discovery.py @ 45274:0e18861f96ab
merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API)
Earlier, manifestmerge() and calculateupdates() returns a tuple of three things.
I wanted to add one more thing to return value.
Introducing a special class which represents results of a merge will help
understand better and also ease adding new return values.
Differential Revision: https://phab.mercurial-scm.org/D8799
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Thu, 23 Jul 2020 18:03:14 +0530 |
parents | c93dd9d9f1e6 |
children | 122f0b59f5f0 |
comparison
equal
deleted
inserted
replaced
45270:c8655782ef19 | 45274:0e18861f96ab |
---|