git-debrebase: merge: gdr-merge-conflicts test: New test

[dgit.git] / debian / tests / control

diff --git a/debian/tests/control b/debian/tests/control
index 1a4f51031752c06292fe1cb63ccc8ca2b5ed21fe..5949c8020b8d28fdacd10f2d0d366074863e6b0d 100644 (file)
--- 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-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
 
 Tests-Directory: tests/tests
 Depends: chiark-utils-bin, git-debrebase, git-buildpackage, faketime