From 62baba6702e68a0cb9eee972b13d7a8c1c9e1c25 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@canonical.com>
Date: Thu, 27 Aug 2009 20:53:29 +0200
Subject: Add bzr-builddep configuration for merge mode.

---
 .bzr-builddeb/default.conf | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .bzr-builddeb/default.conf

(limited to '.bzr-builddeb')

diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
new file mode 100644
index 0000000..3165e05
--- /dev/null
+++ b/.bzr-builddeb/default.conf
@@ -0,0 +1,2 @@
+[BUILDDEB]
+merge = True
-- 
cgit v1.2.3