From 1b2bdd04a05d504bd07f01bc1f72290dcde90a02 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@debian.org>
Date: Fri, 10 Apr 2020 08:28:16 -0400
Subject: gbp.conf: Set merge = False for debrebase

Signed-off-by: James McCoy <jamessan@debian.org>
---
 debian/gbp.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 02e9206..9cb745d 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -7,7 +7,7 @@ pristine-tar = False
 pristine-tar-commit = False
 
 [import-orig]
-merge-mode = merge
+merge = False
 
 [pq]
 patch-numbers = False
-- 
cgit v1.2.3