chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
git-debrebase: merge: Save wreckage in $maindir
[dgit.git]
/
git-debrebase
diff --git
a/git-debrebase
b/git-debrebase
index bd93fbd07eef19090da2380dcc866e6d55a3a953..213728023f249305eb873722d305f3168a1cb0c4 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-384,6
+384,8
@@
sub merge_failed ($$) {
my @m;
push @m, "Merge resolution failed: $emsg";
+ changedir $maindir;
+
my @updates;
merge_wreckage_cleaning \@updates;
keys %$wrecknotes;