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:
ed6ced1
)
git-debrebase: merge: Minor style and error message change
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 17:57:25 +0000
(18:57 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 19:11:09 +0000
(20:11 +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 464a14c4bb03bab5a0c7c8b7adc944e3387a555c..d3ed731ba97e299fe2a8c9368799abc7d5691480 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-1344,8
+1344,9
@@
sub walk ($;$$$) {
my ($btip, $bbw, $banchor) = eval {
walk $ib, 0, $report, $report_lprefix.' ';
};
- $nomerge->("walking interchange branch merge base ($ibleaf): ".
- $@) if length $@;
+ $nomerge->("walking interchange branch merge base ($ibleaf):\n".
+ $@)
+ if length $@;
$mwrecknote->("mergebase-laundered", $btip);
$mwrecknote->("mergebase-breakwater", $bbw);