comparison tests/test-push-checkheads-superceed-A5.t @ 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 34a46d48d24e
children 5996640fc6fe
comparison
equal deleted inserted replaced
46686:26d1ddc3f398 46687:83ffc49f7e48