Mercurial > hg

comparison mercurial/encoding.py @ 45278:0c849f0166c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: introduce hasconflicts() on mergeresult object This and upcoming patches will improve the mergeresult object making it more powerful and provide clean APIs for various things. Doing this will clean up the core merge code which is present in `update()` a bit. Differential Revision: https://phab.mercurial-scm.org/D8816
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 02 Aug 2020 10:12:21 -0700
parents 9d2b2df2c2ba
children a736ab681b78
comparison
equal deleted inserted replaced
45277:c515c54f6530 45278:0c849f0166c2