From 3522f98a237df1650a2361f3545e36396bc6c797 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 15:53:02 +0100 Subject: [PATCH] git-debrebase: merge: Fix a $nomerge message Signed-off-by: Ian Jackson --- git-debrebase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-debrebase b/git-debrebase index 5de9c14b..1e8de529 100755 --- a/git-debrebase +++ b/git-debrebase @@ -1199,7 +1199,7 @@ sub walk ($;$$$) { foreach my $p (@$ps) { $prline->(" VanillaMerge ".$p->{Ix}); if (!is_fast_fwd $p->{Anchor}, $best_anchor) { - $nomerge->('DivergentAnchor'); + $nomerge->('divergent anchors'); } elsif ($p->{Anchor} eq $best_anchor) { print $report " SameAnchor" if $report; } else { -- 2.30.2