Mercurial > hg
comparison mercurial/wireprotov1peer.py @ 44399:a45ffad9ae98
merge: introduce a merge() for that use-case
In the same vein as some earlier patches like f546d2170b0f (merge:
introduce a clean_update() for that use-case, 2020-01-15).
Differential Revision: https://phab.mercurial-scm.org/D8168
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 26 Feb 2020 10:40:31 -0800 |
| parents | a61287a95dc3 |
| children | 89a2afe31e82 |
comparison
equal
deleted
inserted
replaced
| 44398:ddbc296a1f48 | 44399:a45ffad9ae98 |
|---|