Mercurial > hg
view mercurial/mergeutil.py @ 40869:f79659e1e50f
py3: convert filename to bytes in test-hardlinks.t
Windows was complaining about passing str to CreateFileA() in win32.py.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 09 Dec 2018 13:33:36 -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'))