Now dgit runs git-debrebase make-patches, with the result that the
patch commit in this conflict will be made by gdr.
This is what we want, so now that we have it, insist on it.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git checkout dgit/dgit/sid # detach
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
git rebase master
git rebase --skip