From fe0439371d17132ccb6b7a00f1ee57c0576e44fc Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 17 Feb 2018 23:33:03 +0000
Subject: git-debrebase: test suite: gdr-*: break out t-nmu-causes-ff-fail

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 tests/tests/gdr-diverge-nmu | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'tests/tests/gdr-diverge-nmu')

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'
 
-- 
cgit v1.2.3