author | Yuya Nishihara <yuya@tcha.org> |
Mon, 21 Sep 2020 12:36:17 +0900 | |
changeset 45652 | d1759b2e1888 |
parent 45518 | 32ce4cbaec4b |
child 45916 | fa87536d3d70 |
permissions | -rw-r--r-- |
# 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.Abort( _(b"unresolved merge conflicts (see 'hg help resolve')") )