X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-diverge-nmu-dgit;h=007c35b81d68a40dc071896d98bef400d4a9d3d5;hb=17ff17bd19aff9d185f4771d35ce9663c364aeab;hp=ad39577a4ab2c7d07323cacb6cadfcfdcf944213;hpb=a11bdb16b533806efcfc5e529d9394963afa1ee6;p=dgit.git

diff --git a/tests/tests/gdr-diverge-nmu-dgit b/tests/tests/gdr-diverge-nmu-dgit
index ad39577a..007c35b8 100755
--- a/tests/tests/gdr-diverge-nmu-dgit
+++ b/tests/tests/gdr-diverge-nmu-dgit
@@ -42,7 +42,7 @@ t-nmu-causes-ff-fail
 
 git checkout dgit/dgit/sid # detach
 
-t-expect-fail 'E:CONFLICT.*Commit (patch queue|Debian 3\.0 \(quilt\) metadata)' \
+t-expect-fail 'E:CONFLICT.*Commit patch queue' \
 git rebase master
 git rebase --skip