diff options
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -4013,10 +4013,12 @@ sub splitbrain_pseudomerge ($$$$) { infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]); 1; }) { + $@ =~ s/^\n//; chomp $@; print STDERR <<END; -$us: check failed (maybe --overwrite is needed, consult documentation) +$@ +| Not fast forward; maybe --overwrite is needed, see dgit(1) END - die "$@"; + finish -1; } my $r = pseudomerge_make_commit |