From eb672cdb05dc0bd6f2b2b1c6b61d2f055abc73c5 Mon Sep 17 00:00:00 2001
From: Richard Hartmann <richih.mailinglist@gmail.com>
Date: Wed, 16 Nov 2011 12:00:58 +0100
Subject: [PATCH 1/1] Improve error message for aborted clone

---
 vcsh | 1 +
 1 file changed, 1 insertion(+)

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 <foo> git pull' to finish cloning.\n" &&
 		exit 3
 	git merge origin/master
 #	vcsh use $REPO_NAME
-- 
2.39.5