X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=debian%2Ftests%2Fcontrol;h=5949c8020b8d28fdacd10f2d0d366074863e6b0d;hp=1a4f51031752c06292fe1cb63ccc8ca2b5ed21fe;hb=f8b71fe47b3216f14c31c3c2c9075ce32c0cc975;hpb=404b824d7a46eee9fe76398fda6a44a7e9cf3681

diff --git a/debian/tests/control b/debian/tests/control
index 1a4f5103..5949c802 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -20,7 +20,7 @@ Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-import
 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-newupstream gdr-viagit
+Tests: gdr-merge gdr-merge-conflicts gdr-newupstream gdr-viagit
 Tests-Directory: tests/tests
 Depends: chiark-utils-bin, git-debrebase, git-buildpackage, faketime