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=045951300cf4890e4273f294da20894d587b9ad1;hpb=ba38e22d0e2c039c086c2d446304fa55c091ef1f;p=topgit.git

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