chiark / gitweb /
test suite: gdr-diverge-nmu-dgit: Insist on gdr-generated patches
[dgit.git] / tests / tests / gdr-diverge-nmu-dgit
index ad39577a4ab2c7d07323cacb6cadfcfdcf944213..007c35b81d68a40dc071896d98bef400d4a9d3d5 100755 (executable)
@@ -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