diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 18:22:17 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 20:11:09 +0100 |
| commit | 952a781025083b34762fe6bb2093ef64524c23cd (patch) | |
| tree | 7821e4111817d30da2be755361ac94d711307fb1 /tests | |
| parent | 22e1d5872f69e3622bb84e6ea3b8e0b9df06d5d4 (diff) | |
git-debrebase: merge: test suite: Drop check of no wreckage save
We are going to make this nonconfigurable.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/tests/gdr-merge-conflicts | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts index 6871fd8..22cd328 100755 --- a/tests/tests/gdr-merge-conflicts +++ b/tests/tests/gdr-merge-conflicts @@ -54,11 +54,6 @@ 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 test '' = "$(t-git-get-ref-exact $junkref)" |