Mercurial > hg
view mercurial/mergeutil.py @ 47060:fde5bb5d1acf
merge: with stable
author | Augie Fackler <augie@google.com> |
---|---|
date | Mon, 03 May 2021 15:14:09 -0400 |
parents | d4ba4d51f85f |
children | 6000f5b25c9b |
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 absolute_import from .i18n import _ from . import error def checkunresolved(ms): if ms.unresolvedcount(): raise error.StateError( _(b"unresolved merge conflicts (see 'hg help resolve')") )