summaryrefslogtreecommitdiff
path: root/tests/tests/gdr-diverge-nmu
diff options
context:
space:
mode:
Diffstat (limited to 'tests/tests/gdr-diverge-nmu')
-rwxr-xr-xtests/tests/gdr-diverge-nmu3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu
index e647f80..8f0b9cb 100755
--- a/tests/tests/gdr-diverge-nmu
+++ b/tests/tests/gdr-diverge-nmu
@@ -31,8 +31,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
: 'ad hocery'