X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=.topdeps;h=70498c426ccab7de55822101a5f964cc2489ef65;hp=cac0c212af33dd762e8248bb5ebf8bbd0385ed50;hb=refs%2Fheads%2Fi%2Fnew-update;hpb=170fa45b8745b673d31f4b2398780fc0bb7c703d

diff --git a/.topdeps b/.topdeps
index cac0c21..70498c4 100644
--- a/.topdeps
+++ b/.topdeps
@@ -1,2 +1 @@
-i/build
-features/vim-modelines
+i/basis-merge