From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 28 Dec 2011 02:06:24 +0000 (+0000)
Subject: Merge commit 'refs/top-bases/i/basis-merge' into i/basis-merge
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=commitdiff_plain;h=510170a6b5357c10dd2cf1289d1427fe565394e2;hp=120b1ea119b87b3ea292f0c2e2416540e790fcd1

Merge commit 'refs/top-bases/i/basis-merge' into i/basis-merge
---

diff --git a/.topdeps b/.topdeps
index 374fc55..2627f98 100644
--- a/.topdeps
+++ b/.topdeps
@@ -1 +1,7 @@
-debian/locations
+i/build
+features/vim-modelines
+fixes/ensure-worktree
+fixes/export--b-deps
+fixes/independent-help
+fixes/more-help
+fixes/tg--r-require-arg
diff --git a/.topmsg b/.topmsg
index c7f4546..381f6b5 100644
--- a/.topmsg
+++ b/.topmsg
@@ -1,6 +1,6 @@
 From: Ian Jackson <ijackson@chiark.greenend.org.uk>
-Subject: [PATCH] Make buildable directly with debian/rules build, binary
+Subject: [PATCH] EMPTY - BASIS MERGE
 
-Remove all use of quilt.
+Empty patch for merge of included topic branches, only.
 
 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>