Mercurial > hg
view mercurial/mergeutil.py @ 36278:a87093e2805d
hgweb_mod: partially undo 8afc25e7effc to fix py3
We now bytes-ify the entire request, so this is wrong.
Differential Revision: https://phab.mercurial-scm.org/D2308
author | Augie Fackler <augie@google.com> |
---|---|
date | Sat, 17 Feb 2018 22:52:24 -0500 |
parents | c1149533676b |
children | 2372284d9457 |
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.Abort(_("unresolved merge conflicts " "(see 'hg help resolve')")) if ms.mdstate() != 's' or list(ms.driverresolved()): raise error.Abort(_('driver-resolved merge conflicts'), hint=_('run "hg resolve --all" to resolve'))