X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/eb54df6a6239a5401ae7af2edc13410a2f2c9cba..0083a3e21e81a132a150c1626b4b58d53f73a3c8:/vcsh?ds=inline diff --git a/vcsh b/vcsh index 3cea666..f987fbf 100755 --- a/vcsh +++ b/vcsh @@ -24,7 +24,7 @@ basename() { } SELF=$(basename $0) -VERSION='1.20130909' +VERSION='1.20130909.git-HEAD' fatal() { echo "$SELF: fatal: $1" >&2 @@ -159,7 +159,7 @@ 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!