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: Always save wreckage
[dgit.git]
/
tests
/
tests
/
gdr-merge-conflicts
diff --git
a/tests/tests/gdr-merge-conflicts
b/tests/tests/gdr-merge-conflicts
index 6871fd8a45e9aa7d393d392c8ed8b130c8743493..48ed991eae18e697111edbc1d252ae80677132c4 100755
(executable)
--- a/
tests/tests/gdr-merge-conflicts
+++ b/
tests/tests/gdr-merge-conflicts
@@
-56,11
+56,6
@@
git update-ref $junkref v2.1
t-expect-fail F:'divergent anchors' \
t-git-debrebase
-git rev-parse $junkref
-
-t-expect-fail F:'divergent anchors' \
-t-git-debrebase --save-wreckage
-
test '' = "$(t-git-get-ref-exact $junkref)"
git for-each-ref refs/debrebase-wreckage | egrep .