X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=debian%2Ftests%2Fcontrol;h=f8957a09b60d6a88227a082f6fddf849e6efde72;hb=1da1a2b176cb726e3e076ccb7f38f1e676430b18;hp=a909f10fccb52e21a988ee01662dc9c4fe487660;hpb=6f3e3449c7f62594e48df4f5851b08b7366fb5dc;p=dgit.git

diff --git a/debian/tests/control b/debian/tests/control
index a909f10f..f8957a09 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -16,11 +16,15 @@ Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc
 Restrictions: x-dgit-intree-only x-dgit-git-only
 
+Tests: gdr-merge-conflicts
+Tests-Directory: tests/tests
+Depends: chiark-utils-bin, git-debrebase, git-buildpackage, faketime, quilt
+
 Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-import-dgitview gdr-import-nostitch gdr-makepatches7 gdr-subcommands gdr-unprocessable gdr-unprocessable-hints
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, git-debrebase, git-buildpackage, faketime
 
-Tests: gdr-merge gdr-merge-conflicts gdr-newupstream gdr-viagit
+Tests: gdr-merge gdr-newupstream gdr-viagit
 Tests-Directory: tests/tests
 Depends: chiark-utils-bin, git-debrebase, git-buildpackage, faketime