summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 12:23:35 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 12:23:35 +0100
commit7733ad1abc82a79f835c02f89d18c743dd107d91 (patch)
treeaf7d007d827ce944a92cd2a9ebe386f65586c2fb /git-debrebase
parent2250673c9e458438ae3df6c98bbf0423e81891d3 (diff)
git-debrebase: merge: Generate merged-breakwaters with correct metadata
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase
index 06cdc76..e068f35 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,