Mercurial > hg
comparison mercurial/exchangev2.py @ 46687:83ffc49f7e48 stable
morestatus: convert a UI message about merge conflicts to bytes
Differential Revision: https://phab.mercurial-scm.org/D10172
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Thu, 11 Mar 2021 17:14:30 -0500 |
parents | 89a2afe31e82 |
children | 009130064813 |
comparison
equal
deleted
inserted
replaced
46686:26d1ddc3f398 | 46687:83ffc49f7e48 |
---|