Mercurial > hg
comparison mercurial/scmposix.py @ 45285:e7196f1da2b1
merge: pass mergeresult obj instead of actions in _filternarrowactions()
We want to use rich mergeresult object and it's APIs instead of handling a
dictionary.
Differential Revision: https://phab.mercurial-scm.org/D8823
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Fri, 24 Jul 2020 17:49:13 +0530 |
| parents | 9f70512ae2cf |
| children | 9ac96b9fa76e |
comparison
equal
deleted
inserted
replaced
| 45284:31c454a5f1a8 | 45285:e7196f1da2b1 |
|---|