Mercurial > public > mercurial-scm > hg-stable
view mercurial/mergeutil.py @ 53018:65f6f1fe43ef
rhg-files: use the correct long-form flag for selecting a revision
This went unnoticed forever, I guess most users pass in `-r`.
author | Rapha?l Gom?s <rgomes@octobus.net> |
---|---|
date | Wed, 26 Feb 2025 09:25:53 -0500 |
parents | f4733654f144 |
children |
line wrap: on
line source
# mergeutil.py - help for merge processing in mercurial # # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com> # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. from __future__ import annotations from .i18n import _ from . import error def checkunresolved(ms): if ms.unresolvedcount(): raise error.StateError( _(b"unresolved merge conflicts (see 'hg help resolve')") )