diff options
| -rwxr-xr-x | git-debrebase | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/git-debrebase b/git-debrebase index 2137280..c3bd7ff 100755 --- a/git-debrebase +++ b/git-debrebase @@ -396,8 +396,12 @@ sub merge_failed ($$) { push @m, "Wreckage left in $wrecknoteprefix/*."; push @m, "See git-debrebase(1) section FAILED MERGES for suggestions."; - # ^ xxx this section does not yet exist - fail join '', map { "$_\n" } @m; + + # use finish rather than fail, in case we are within an eval + # (that can happen inside walk!) + print STDERR "\n"; + print STDERR "$us: $_\n" foreach @m; + finish 15; } sub mwrecknote ($$$) { |