From 30a7ead54a9ca133f1f0d7ac7c3836d9e6fb86a1 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 25 Aug 2018 18:32:56 +0100
Subject: [PATCH] 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>
---
 tests/tests/gdr-merge-conflicts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
-- 
2.30.2