[xmltooling] 01/01: Update gbp configuration

[Etienne Dysli Metref]

This is an automated email from the git hooks/post-receive script.

edm-guest pushed a commit to branch debian/master
in repository xmltooling.

commit 5aff9d053c21f185e3e3730d58c87767bdccc2e1
Author: Ferenc Wágner <wferi at debian.org>
Date:   Wed Jan 17 15:49:09 2018 +0100

    Update gbp configuration
    
    - Move pristine-tar = True into the DEFAULT section
    - Add merge-mode = replace into the import-orig section
---
 debian/gbp.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index c42c1ad..3045a1c 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,9 +1,10 @@
 [DEFAULT]
 debian-branch = debian/master
 upstream-branch = upstream/latest
+pristine-tar = True
 
 [import-orig]
-pristine-tar = True
+merge-mode = replace
 
 [dch]
 full = True

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/xmltooling.git