X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-merge-conflicts;h=1f3f09e0d1a6ec3336d0ed694b99be4c1e7f4128;hb=50b6d1fa7bd440dcc7ef9d1803aa8e71e388361f;hp=660415d9cb91ab56abb6db278588f476f912f854;hpb=7bc6dfb448ed6279adb7a3eafa3dcc86a2c111b5;p=dgit.git diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts index 660415d9..1f3f09e0 100755 --- 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