# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1643376351 -3600
# Node ID 48aff31e7f4c942ffa9a297fe0dfefb3f34d061f
# Parent  00bfd920169dbbf97e851f1391ec8687bbfe2b6f
merge: break up a not-so-one-liner for readability

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

diff -r 00bfd920169d -r 48aff31e7f4c mercurial/merge.py
--- a/mercurial/merge.py	Fri Jan 28 14:25:45 2022 +0100
+++ b/mercurial/merge.py	Fri Jan 28 14:25:51 2022 +0100
@@ -2368,9 +2368,8 @@
 def back_out(ctx, parent=None, wc=None):
     if parent is None:
         if ctx.p2() is not None:
-            raise error.ProgrammingError(
-                b"must specify parent of merge commit to back out"
-            )
+            msg = b"must specify parent of merge commit to back out"
+            raise error.ProgrammingError(msg)
         parent = ctx.p1()
     return _update(
         ctx.repo(),