Mercurial > public > mercurial-scm > hg
view mercurial/mergeutil.py @ 46819:d4ba4d51f85f
contributor: change mentions of mpm to olivia
Matt Mackall is now Olivia Mackall.
I reached out to her about changing the copyright notices to reflect this
change and she gave me the green light, so I changed everything relevant.
Differential Revision: https://phab.mercurial-scm.org/D10266
author | Rapha?l Gom?s <rgomes@octobus.net> |
---|---|
date | Thu, 25 Mar 2021 18:02:08 +0100 |
parents | dfca84970da8 |
children | 6000f5b25c9b |
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 __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')") )