X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/8fdcc3386f9767aebfecf3eda3cff16333273644..024b65aac5760f1e89811b4eb3fa2a7722fca8d8:/vcsh?ds=sidebyside diff --git a/vcsh b/vcsh index ed42920..3924009 100755 --- a/vcsh +++ b/vcsh @@ -159,11 +159,11 @@ clone() { for object in $(git ls-tree -r origin/master | awk '{print $4}'); do [ -e "$object" ] && error "'$object' exists." && - VCSH_CONFLICT=1; + VCSH_CONFLICT=1 done [ "$VCSH_CONFLICT" = '1' ] && fatal "will stop after fetching and not try to merge! - Once this situation has been resolved, run 'vcsh run $VCSH_REPO_NAME git pull' to finish cloning.\n" 17 + Once this situation has been resolved, run 'vcsh run $VCSH_REPO_NAME git pull' to finish cloning." 17 git merge origin/master hook post-clone retire