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: test suite: Drop check of no wreckage save
[dgit.git]
/
tests
/
tests
/
gdr-merge-conflicts
diff --git
a/tests/tests/gdr-merge-conflicts
b/tests/tests/gdr-merge-conflicts
index 6871fd8a45e9aa7d393d392c8ed8b130c8743493..22cd32887e5f2a020e34a35414b2a7fd3517fb01 100755
(executable)
--- a/
tests/tests/gdr-merge-conflicts
+++ b/
tests/tests/gdr-merge-conflicts
@@
-53,11
+53,6
@@
git commit -a --amend --no-edit
junkref=refs/debrebase-wreckage/junk
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