author | Matt Harbison <matt_harbison@yahoo.com> |
Mon, 21 Aug 2023 17:41:01 -0400 | |
changeset 50967 | 36f116820853 |
parent 48875 | 6000f5b25c9b |
child 51863 | f4733654f144 |
permissions | -rw-r--r-- |
# 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 .i18n import _ from . import error def checkunresolved(ms): if ms.unresolvedcount(): raise error.StateError( _(b"unresolved merge conflicts (see 'hg help resolve')") )