summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 15:53:02 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 15:53:02 +0100
commit3522f98a237df1650a2361f3545e36396bc6c797 (patch)
treeb0e0b79cac4d1a7907b3ad1397933bbd377858bd
parent4d04b76e036b801529fd19a1e45bed0a31a3c8dc (diff)
git-debrebase: merge: Fix a $nomerge message
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xgit-debrebase2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase
index 5de9c14..1e8de52 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 {