Mercurial > hg
view mercurial/mergeutil.py @ 50999:d0b8bbf603d7
openvms: consider worker costly on OpenVMS
As for Windows, the parallel worker feature is less appealing on OpenVMS.
author | Jean-Francois Pieronne <jf.pieronne@laposte.net> |
---|---|
date | Thu, 03 Aug 2023 02:30:57 +0200 |
parents | 6000f5b25c9b |
children |
line wrap: on
line source
# 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 .i18n import _ from . import error def checkunresolved(ms): if ms.unresolvedcount(): raise error.StateError( _(b"unresolved merge conflicts (see 'hg help resolve')") )