diff options
Diffstat (limited to 'tests/tests/gdr-merge-conflicts')
| -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)" |