summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2015-08-11 19:40:22 +0200
committerJulian Andres Klode <jak@debian.org>2015-08-11 20:02:32 +0200
commitd51c70b771362c77186d58378bb7bfe15750390a (patch)
tree1cce48992ba38a78824e9bb887402d93f77662cb
parent6d7122b5356c0b4d8f51aafdfc1c232392fca695 (diff)
debian/gbp.conf: Set multimaint-merge = True
Gbp-Dch: ignore
-rw-r--r--debian/gbp.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 135522d40..6bad84301 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -4,4 +4,5 @@ postbuild = ./prepare-release post-build
debian-branch = debian/experimental
debian-tag = %(version)s
export-dir = ../build-area
-sign-tags = True \ No newline at end of file
+sign-tags = True
+multimaint-merge = True