X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftests%2Fgdr-merge-conflicts;fp=tests%2Ftests%2Fgdr-merge-conflicts;h=48ed991eae18e697111edbc1d252ae80677132c4;hb=ca84cb09d15eade6d18c8eba1c6a3bd8c42b1f28;hp=22cd32887e5f2a020e34a35414b2a7fd3517fb01;hpb=952a781025083b34762fe6bb2093ef64524c23cd;p=dgit.git diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts index 22cd3288..48ed991e 100755 --- a/tests/tests/gdr-merge-conflicts +++ b/tests/tests/gdr-merge-conflicts @@ -54,7 +54,7 @@ junkref=refs/debrebase-wreckage/junk git update-ref $junkref v2.1 t-expect-fail F:'divergent anchors' \ -t-git-debrebase --save-wreckage +t-git-debrebase test '' = "$(t-git-get-ref-exact $junkref)"