diff tests/test-pull.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 95c4cca641f6
children ce42fe36d581
line wrap: on
line diff