From: Ian Jackson Date: Wed, 28 Dec 2011 02:12:35 +0000 (+0000) Subject: wip X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=refs%2Fheads%2Fi%2Fnew-update;p=topgit.git wip --- diff --git a/.topdeps b/.topdeps index 2627f98..70498c4 100644 --- a/.topdeps +++ b/.topdeps @@ -1,7 +1 @@ -i/build -features/vim-modelines -fixes/ensure-worktree -fixes/export--b-deps -fixes/independent-help -fixes/more-help -fixes/tg--r-require-arg +i/basis-merge diff --git a/.topmsg b/.topmsg index 381f6b5..6630907 100644 --- a/.topmsg +++ b/.topmsg @@ -1,6 +1,6 @@ From: Ian Jackson -Subject: [PATCH] EMPTY - BASIS MERGE +Subject: [PATCH] i/new-update -Empty patch for merge of included topic branches, only. + Signed-off-by: Ian Jackson