Mercurial > hg
view mercurial/mergeutil.py @ 45980:fe7d7917ceb5
upgrade: rename UPGRADE_FILELOG to UPGRADE_FILELOGS
They are multiple filelog to upgrade, so this seems more accurate.
Differential Revision: https://phab.mercurial-scm.org/D9466
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 30 Nov 2020 12:24:36 +0100 |
parents | fa87536d3d70 |
children | dfca84970da8 |
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 list(ms.unresolved()): raise error.StateError( _(b"unresolved merge conflicts (see 'hg help resolve')") )