git-debrebase: gdr-merge-conflicts: Call git merge --no-edit

The default seems different in my sid chroot.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts
index 1f3f09e0d1a6ec3336d0ed694b99be4c1e7f4128..5a3f2432cf21670c4377838251c9bb6e68bd807b 100755 (executable)
--- 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