chiark / gitweb /
git-debrebase: merge: Generate merged-breakwaters with correct metadata
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 11:23:35 +0000 (12:23 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 11:23:35 +0000 (12:23 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase

index 06cdc76..e068f35 100755 (executable)
@@ -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,