summaryrefslogtreecommitdiffstats
path: root/debian/gbp.conf
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/gbp.conf3
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 12c6021..514ccaf 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -4,3 +4,6 @@
debian-branch = debian/latest
upstream-branch = upstream/latest
pristine-tar = True
+
+[import-orig]
+merge-mode = replace