X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-merge-conflicts;fp=tests%2Ftests%2Fgdr-merge-conflicts;h=5a3f2432cf21670c4377838251c9bb6e68bd807b;hb=30a7ead54a9ca133f1f0d7ac7c3836d9e6fb86a1;hp=1f3f09e0d1a6ec3336d0ed694b99be4c1e7f4128;hpb=8273a14340edc80b2a71815c8a0e6149f9b8392a;p=dgit.git

diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts
index 1f3f09e0..5a3f2432 100755
--- a/tests/tests/gdr-merge-conflicts
+++ b/tests/tests/gdr-merge-conflicts
@@ -6,6 +6,7 @@ autoimport=
 t-dependencies NO-DGIT GDR quilt
 
 t-tstunt-parsechangelog
+t-tstunt debchange
 t-setup-import gdr-convert-gbp-noarchive
 
 t_gdr_xopts+=' --experimental-merge-resolution'
@@ -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