]> gitweb.factorcode.org Git - factor.git/commitdiff
mason.git: cleanup
authorSlava Pestov <slava@factorcode.org>
Sat, 29 Oct 2011 04:52:55 +0000 (21:52 -0700)
committerSlava Pestov <slava@factorcode.org>
Sat, 29 Oct 2011 04:53:39 +0000 (21:53 -0700)
extra/mason/git/git.factor

index 9aeeda82682ee1640299add45ef804ae48c69849..de83f8b094bc8927b07577771f8db89eb9f81c7c 100644 (file)
@@ -47,7 +47,7 @@ IN: mason.git
 
 : git-pull-failed ( error -- )
     dup output-process-error? [
-        dup output>> "not uptodate. Cannot merge." swap start
+        dup output>> "not uptodate. Cannot merge." swap subseq?
         [ git-repo-corrupted ]
         [ rethrow ]
         if