author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Thu, 21 Apr 2022 11:32:51 +0200 | |
changeset 49246 | 58a814d062ca |
parent 48966 | 6000f5b25c9b |
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')") )