chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
test suite: Fix dependencies of new gdr-merge-conflicts test.
[dgit.git]
/
tests
/
tests
/
gdr-merge-conflicts
diff --git
a/tests/tests/gdr-merge-conflicts
b/tests/tests/gdr-merge-conflicts
index 660415d9cb91ab56abb6db278588f476f912f854..1f3f09e0d1a6ec3336d0ed694b99be4c1e7f4128 100755
(executable)
--- a/
tests/tests/gdr-merge-conflicts
+++ b/
tests/tests/gdr-merge-conflicts
@@
-3,7
+3,7
@@
set -e
autoimport=
. tests/lib
-t-dependencies NO-DGIT GDR
+t-dependencies NO-DGIT GDR
quilt
t-tstunt-parsechangelog
t-setup-import gdr-convert-gbp-noarchive