From 61a063b1992cf8d61859e98306ef9aec65d075a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?ChangZhuo=20Chen=20=28=E9=99=B3=E6=98=8C=E5=80=AC=29?=
 <czchen@debian.org>
Date: Sun, 15 Nov 2015 20:24:24 +0800
Subject: [PATCH] Revert "Update gbp.conf"

This reverts commit 0dbe8613b4f83d0a19e256824d0b1540b40dd85c.
---
 debian/gbp.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index ead668a..7a9f00a 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -2,3 +2,7 @@
 debian-branch = debian/sid
 upstream-branch = upstream/latest
 pristine-tar = True
+
+[import-orig]
+# Use git cherrypick -n upstream instead.
+merge = False