mason.git: cleanup
parent
5b69026f59
commit
0d02c16d14
|
@ -47,7 +47,7 @@ IN: mason.git
|
||||||
|
|
||||||
: git-pull-failed ( error -- )
|
: git-pull-failed ( error -- )
|
||||||
dup output-process-error? [
|
dup output-process-error? [
|
||||||
dup output>> "not uptodate. Cannot merge." swap start
|
dup output>> "not uptodate. Cannot merge." swap subseq?
|
||||||
[ git-repo-corrupted ]
|
[ git-repo-corrupted ]
|
||||||
[ rethrow ]
|
[ rethrow ]
|
||||||
if
|
if
|
||||||
|
|
Loading…
Reference in New Issue