Mercurial > hg
comparison mercurial/rewriteutil.py @ 45284:31c454a5f1a8
merge: pass mergeresult in checkpassconflicts() instead of actions (API)
This is a part of series which aims to use mergeresult obj instead of an action
dictionary.
Differential Revision: https://phab.mercurial-scm.org/D8822
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Fri, 24 Jul 2020 17:31:26 +0530 |
| parents | a391d0710f22 |
| children | 0a57ef4b3bdb |
comparison
equal
deleted
inserted
replaced
| 45283:f1fb9a079131 | 45284:31c454a5f1a8 |
|---|