# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 2022-01-28 13:25:39
# Node ID bca57b01518fdac7bd8f4f18dfa26cee8c7f2885
# Parent  58a2c66fa94c83e3f93befe417d4a3d6c58ab694

merge: break up a not-so-one-liner for readability

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

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1927,10 +1927,9 @@ def _update(
                 raise error.Abort(m_a)
             elif pas == [p1]:
                 if not mergeancestor and wc.branch() == p2.branch():
-                    raise error.Abort(
-                        _(b"nothing to merge"),
-                        hint=_(b"use 'hg update' or check 'hg heads'"),
-                    )
+                    msg = _(b"nothing to merge")
+                    hint = _(b"use 'hg update' or check 'hg heads'")
+                    raise error.Abort(msg, hint=hint)
             if not force and (wc.files() or wc.deleted()):
                 raise error.StateError(
                     _(b"uncommitted changes"),