X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg-update.sh;h=73280c65af79af2da50204582c7029a00cfcef34;hp=040800d6fb3805ef92519e436fe9cbb353cdbb77;hb=81b2ec861034ac65909d3d9f578690fcac0c731b;hpb=ca372f7719a52dfa46af01362df6c4538c004727

diff --git a/tg-update.sh b/tg-update.sh
index 040800d..73280c6 100644
--- a/tg-update.sh
+++ b/tg-update.sh
@@ -59,7 +59,7 @@ if [ -s "$depcheck" ]; then
 					info "You are in a subshell. If you abort the merge,"
 					info "use \`exit 1\` to abort the recursive update altogether."
 					if ! sh -i </dev/tty; then
-						info "Ok, you aborated the merge. Now, you just need to"
+						info "Ok, you aborted the merge. Now, you just need to"
 						info "switch back to some sane branch using \`git checkout\`."
 						exit 3
 					fi
@@ -142,3 +142,5 @@ if ! git merge "$merge_with"; then
 	fi
 	exit 3
 fi
+
+# vim:noet