X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgdr-merge-conflicts;h=48ed991eae18e697111edbc1d252ae80677132c4;hp=6871fd8a45e9aa7d393d392c8ed8b130c8743493;hb=ca84cb09d15eade6d18c8eba1c6a3bd8c42b1f28;hpb=22e1d5872f69e3622bb84e6ea3b8e0b9df06d5d4 diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts index 6871fd8a..48ed991e 100755 --- 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 .