Mercurial > hg

diff tests/failfilemerge.py @ 46687:83ffc49f7e48 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 a736ab681b78
children de8181c5414d
line wrap: on
line diff