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

diff --git a/.topdeps b/.topdeps
index 0459513..70498c4 100644
--- a/.topdeps
+++ b/.topdeps
@@ -1 +1 @@
-upstream
+i/basis-merge