summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stapelberg <stapelberg@debian.org>2017-07-19 18:57:41 +0200
committerMichael Stapelberg <stapelberg@debian.org>2017-07-19 18:57:41 +0200
commit4396a9d8f43c32d7b1927f084eec4049479b3167 (patch)
treea9c8b9c5bf4f2eb8c619d7c6c32f98fdaf4cdea4
parent1975ce9236b39c0fb43c91ccdc937629e3913e5f (diff)
gbp.conf: remove merge = false for idiomatic repository layout
-rw-r--r--debian/gbp.conf3
1 files changed, 0 insertions, 3 deletions
diff --git a/debian/gbp.conf b/debian/gbp.conf
index d6cf0f9..1d6ee7b 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,8 +1,5 @@
[DEFAULT]
pristine-tar = True
-[import-orig]
-merge = False
-
[dch]
id-length = 0