X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-merge;h=78b79e9b9bc74e1ba47c6d77a49c198b3074e8a5;hb=48cd6449acfebc08b1ba2c00871737759c285216;hp=14a823795eaeda4461bc61b88b75fd66f54c430a;hpb=fad5cfbb7f5309a5f976990883d875e5d38bc000;p=dgit.git

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index 14a82379..78b79e9b 100755
--- a/tests/tests/gdr-merge
+++ b/tests/tests/gdr-merge
@@ -3,7 +3,7 @@ set -e
 autoimport=
 . tests/lib
 
-t-dependencies NO-DGIT GDR
+t-dependencies GDR
 
 t-tstunt-parsechangelog
 t-setup-import gdr-convert-gbp-noarchive
@@ -41,7 +41,7 @@ t-merge-conflicted-stripping-conflict-markers other debian/zorkmid
 t-expect-fail E:'general two-parent merge' \
 t-git-debrebase
 
-export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
+t_gdr_xopts+=' --experimental-merge-resolution'
 
 : ----- expect to be able to merge -----
 
@@ -59,4 +59,7 @@ t-some-changes after
 t-git-debrebase
 t-gdr-good laundered
 
+t-dgit quilt-fixup
+t-gdr-made-patches
+
 t-ok