chiark
/
gitweb
/
~ian
/
topgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
a7e52f0
)
tg-update: fix user visible typo in info msg
author
Ilpo Järvinen
<ilpo.jarvinen@helsinki.fi>
Thu, 28 May 2009 06:04:33 +0000
(09:04 +0300)
committer
Uwe Kleine-König
<u.kleine-koenig@pengutronix.de>
Thu, 28 May 2009 07:17:00 +0000
(09:17 +0200)
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
tg-update.sh
patch
|
blob
|
history
diff --git
a/tg-update.sh
b/tg-update.sh
index 288ec14f849495734fec17b839abf678f366ad78..73280c65af79af2da50204582c7029a00cfcef34 100644
(file)
--- 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 abor
a
ted 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