chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
4d04b76
)
git-debrebase: merge: Fix a $nomerge message
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 14:53:02 +0000
(15:53 +0100)
committer
Ian 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
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index 5de9c14b74f63e42d5628ab355febb89ace3a182..1e8de52941e10f68a80dc244642925ac0169cbd4 100755
(executable)
--- 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 {