From: Richard Hartmann Date: Wed, 16 Nov 2011 11:00:58 +0000 (+0100) Subject: Improve error message for aborted clone X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/eb672cdb05dc0bd6f2b2b1c6b61d2f055abc73c5?ds=sidebyside Improve error message for aborted clone --- diff --git a/vcsh b/vcsh index 7f475fe..c1b4874 100755 --- a/vcsh +++ b/vcsh @@ -144,6 +144,7 @@ elif [ "$1" = 'clone' ]; then done [ "$VCSH_CONFLICT" = '1' ] && echo "$SELF: fatal: will stop after fetching and not try to merge!\n" && + echo " Once this situation has been resolved, run 'vcsh run git pull' to finish cloning.\n" && exit 3 git merge origin/master # vcsh use $REPO_NAME