From 952a781025083b34762fe6bb2093ef64524c23cd Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 18:22:17 +0100 Subject: [PATCH] git-debrebase: merge: test suite: Drop check of no wreckage save We are going to make this nonconfigurable. Signed-off-by: Ian Jackson --- tests/tests/gdr-merge-conflicts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts index 6871fd8a..22cd3288 100755 --- 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 -- 2.30.2