diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 17:01:52 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 18:34:50 +0100 |
| commit | f8b71fe47b3216f14c31c3c2c9075ce32c0cc975 (patch) | |
| tree | 90de1efda8f29179a98585b0808b7a0a375fa30c /debian | |
| parent | fad5cfbb7f5309a5f976990883d875e5d38bc000 (diff) | |
git-debrebase: merge: gdr-merge-conflicts test: New test
Will be improved later.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/tests/control | 2 |
1 files changed, 1 insertions, 1 deletions
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 |