Merge branch 'master' of git://github.com/psionides/git-subtree

diff --git a/todo b/todo
index 5e72b2e5100bccbf820cf47269d8a66009d0a74f..7e44b0024fa35ae76f62875704fcd24e3f690c7d 100644 (file)
--- a/todo
+++ b/todo
@@ -36,10 +36,6 @@
                one of the other git tools that git-subtree calls.  Should
                detect this situation and print the *real* problem.
        
-       In fact, the prefix should *not* end with slash, and we
-               should detect (and fix) it if it does.  Otherwise the
-               log message looks weird.
-               
        "pull --squash" should do fetch-synthesize-merge, but instead just
                does "pull" directly, which doesn't work at all.