Mercurial > hg

changeset 48705:bca57b01518f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: break up a not-so-one-liner for readability Differential Revision: https://phab.mercurial-scm.org/D12108
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 28 Jan 2022 14:25:39 +0100
parents 58a2c66fa94c
children 00bfd920169d
files mercurial/merge.py
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Fri Jan 28 14:25:32 2022 +0100
+++ b/mercurial/merge.py	Fri Jan 28 14:25:39 2022 +0100
@@ -1927,10 +1927,9 @@
                 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"),