From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 11:23:35 +0000 (+0100)
Subject: git-debrebase: merge: Generate merged-breakwaters with correct metadata
X-Git-Tag: archive/debian/6.7~131
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=7733ad1abc82a79f835c02f89d18c743dd107d91

git-debrebase: merge: Generate merged-breakwaters with correct metadata

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index 06cdc769..e068f35f 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1219,7 +1219,8 @@ sub walk ($;$$$) {
 	    push @brw_cl, {
                 %$cl,
                 SpecialMethod => 'MergeCreateMergedBreakwaters',
-                $xmsg->('construct merged breakwater from vanilla merge'),
+                $xmsg->('constructed from vanilla merge',
+			' merged-breakwater'),
             };
 	    push @upp_cl, {
                 %$cl,