Mercurial > hg
view mercurial/mergeutil.py @ 49905:cd125eef4388
tests: check how hgweb handles HEAD requests
This test file is loosely based on test-hgweb.t.
HEAD support originally implemented in fda5a4b853ab.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Wed, 11 Jan 2023 17:51:04 +0400 |
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')") )