From f8b71fe47b3216f14c31c3c2c9075ce32c0cc975 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 17:01:52 +0100 Subject: git-debrebase: merge: gdr-merge-conflicts test: New test Will be improved later. Signed-off-by: Ian Jackson --- debian/tests/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/tests') diff --git a/debian/tests/control b/debian/tests/control index 1a4f510..5949c80 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 -- cgit v1.2.3