X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib-gdr;h=ac4a476ea3596ba34cd87f85c24b654a8c6d6889;hp=da119bca098ee1048250c7d7e419a21a6ef64eff;hb=fe0439371d17132ccb6b7a00f1ee57c0576e44fc;hpb=70e4369aa8239f967f89d0972e964b8dc9b2e3b5

diff --git a/tests/lib-gdr b/tests/lib-gdr
index da119bca..ac4a476e 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -203,6 +203,11 @@ t-maintainer-commit-some-changes () {
 	t-git-next-date
 }
 
+t-nmu-causes-ff-fail () {
+	t-expect-fail E:'Not.*fast-forward' \
+	git merge --ff-only dgit/dgit/sid
+}
+
 t-nmu-reconciled-good () {
 	local nmutree=$1