1# mergeutil.py - help for merge processing in mercurial 2# 3# Copyright 2005-2007 Olivia Mackall <olivia@selenic.com> 4# 5# This software may be used and distributed according to the terms of the 6# GNU General Public License version 2 or any later version. 7 8from __future__ import absolute_import 9 10from .i18n import _ 11 12from . import error 13 14 15def checkunresolved(ms): 16 if ms.unresolvedcount(): 17 raise error.StateError( 18 _(b"unresolved merge conflicts (see 'hg help resolve')") 19 ) 20