From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 14:53:02 +0000 (+0100)
Subject: git-debrebase: merge: Fix a $nomerge message
X-Git-Tag: archive/debian/6.7~114
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=3522f98a237df1650a2361f3545e36396bc6c797

git-debrebase: merge: Fix a $nomerge message

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

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 {