Mercurial > hg
view mercurial/mergeutil.py @ 46466:3e3b81b6e7da
debugcommands: s/stdin/stdout in debugnodemap help
Differential Revision: https://phab.mercurial-scm.org/D9930
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Mon, 25 Jan 2021 14:23:47 +0530 |
parents | dfca84970da8 |
children | d4ba4d51f85f |
line wrap: on
line source
# mergeutil.py - help for merge processing in mercurial # # Copyright 2005-2007 Matt Mackall <mpm@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')") )