[Pkg-mono-svn-commits] [SCM] mono branch, master-experimental, updated. debian/2.6.3-4-34-gd1bf954

[Mirco Bauer]

The following commit has been merged in the master-experimental branch:
commit 1823ffa071532293f43d085ff6dfe199c880ec3b
Author: Mirco Bauer <meebey at meebey.net>
Date:   Mon Aug 2 17:13:08 2010 +0200

    Don't let git-import-orig do merges

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 231149e..0952a5e 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -3,6 +3,7 @@ id-length = 7
 meta = True
 [git-import-orig]
 postimport = git-dch -N%(version)s -S -a --debian-branch=$GBP_BRANCH
+no-merge = True
 [DEFAULT]
 debian-branch = master-experimental
 upstream-branch = upstream-experimental

-- 
mono