X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-merge-conflicts;fp=tests%2Ftests%2Fgdr-merge-conflicts;h=12e7055aaa2f59f8daec382d885b6231af641b30;hb=6a7d91dc81cbc8922bebc4930991902a9a00da79;hp=f0abea79572c7ce9fec02b7a2537081814aeeac4;hpb=97b08388e773fb6c89817f583ea75dd0098f988a;p=dgit.git

diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts
index f0abea79..12e7055a 100755
--- a/tests/tests/gdr-merge-conflicts
+++ b/tests/tests/gdr-merge-conflicts
@@ -112,7 +112,6 @@ git commit -m FIX
 git reset --hard
 git clean -xdff
 
-t-expect-fail F:todo \
 t-git-debrebase record-resolved-merge
 
 git checkout master