X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgdr-diverge-nmu-dgit;h=02fb2f704481763303d55ac89c305ac32c8026cf;hp=f7bf3d51f4469100034c22456c1b76086d5ada35;hb=fe0439371d17132ccb6b7a00f1ee57c0576e44fc;hpb=70e4369aa8239f967f89d0972e964b8dc9b2e3b5

diff --git a/tests/tests/gdr-diverge-nmu-dgit b/tests/tests/gdr-diverge-nmu-dgit
index f7bf3d51..02fb2f70 100755
--- a/tests/tests/gdr-diverge-nmu-dgit
+++ b/tests/tests/gdr-diverge-nmu-dgit
@@ -35,8 +35,7 @@ t-maintainer-commit-some-changes
 t-dgit fetch
 t-git-next-date
 
-t-expect-fail E:'Not.*fast-forward' \
-git merge --ff-only dgit/dgit/sid
+t-nmu-causes-ff-fail
 
 : 'rebase nmu onto our branch'