X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-merge-conflicts;h=5a3f2432cf21670c4377838251c9bb6e68bd807b;hb=48cd6449acfebc08b1ba2c00871737759c285216;hp=71be2807b47ce5f655e7f42159068adba6450859;hpb=e06f678462c60f83e45ad32328f4633390983341;p=dgit.git

diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts
index 71be2807..5a3f2432 100755
--- a/tests/tests/gdr-merge-conflicts
+++ b/tests/tests/gdr-merge-conflicts
@@ -3,12 +3,13 @@ set -e
 autoimport=
 . tests/lib
 
-t-dependencies NO-DGIT GDR
+t-dependencies NO-DGIT GDR quilt
 
 t-tstunt-parsechangelog
+t-tstunt debchange
 t-setup-import gdr-convert-gbp-noarchive
 
-export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
+t_gdr_xopts+=' --experimental-merge-resolution'
 
 wreckage-before () {
 	junkref=refs/debrebase/wreckage/junk
@@ -58,7 +59,7 @@ git branch master-before-merge
 
 : ----- make the merge -----
 
-git merge -s ours other
+git merge --no-edit -s ours other
 
 # we have to do a little dance to make this not a pseudomerge
 t-git-next-date