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

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