Mercurial > hg-stable
view mercurial/mergeutil.py @ 46688:324ded1aa2ab
copies: inline _backwardrenames() in pathcopies()
I'll add another filtering step in `patchcopies()` next. I need access
to the forward copies for that.
Differential Revision: https://phab.mercurial-scm.org/D10119
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 05 Mar 2021 14:26:56 -0800 |
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')") )