chiark / gitweb /
git-debrebase: merge: Fix a $nomerge message
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 14:53:02 +0000 (15:53 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 14:53:02 +0000 (15:53 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase

index 5de9c14..1e8de52 100755 (executable)
@@ -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 {