view mercurial/mergeutil.py @ 45791:1f9736eb0e65

histedit: drop fallback to empty string from rendertemplate()

AFAICT, `cmdutil.rendertemplate()` always returns bytes (never
e.g. `None`), so we don't need to fall back to empty
(byte-)string. The fallback has been there since the code was added in
11c076786d56 (histedit: add templating support to histedit's rule file
generation, 2019-01-29).

Differential Revision: https://phab.mercurial-scm.org/D9244

# mergeutil.py - help for merge processing in mercurial
#
# Copyright 2005-2007 Matt Mackall <[e-mail]>
#
# 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(
            _(b"unresolved merge conflicts (see 'hg help resolve')")
        )