Dashboard
PHP:
8.3.33
OS:
Linux
User:
letter7
/
/
usr
/
lib64
/
python3.9
/
site-packages
/
mercurial
📤 Upload
📝 New File
📁 New Folder
Close
Editing: mergeutil.py
# 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 __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')") )
Save
Cancel