From eafd8ec0bc6e50f452966ff3be0dde5ea863b640 Mon Sep 17 00:00:00 2001
From: Petr Baudis <pasky@suse.cz>
Date: Thu, 25 Sep 2008 20:50:36 +0200
Subject: [PATCH] tg update: Fix bogus advice on failed base update

---
 tg-update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tg-update.sh b/tg-update.sh
index f36624f..24615a6 100644
--- a/tg-update.sh
+++ b/tg-update.sh
@@ -75,7 +75,7 @@ if [ -s "$depcheck" ]; then
 			info "Updating base with $dep changes..."
 			if ! git merge "$dep"; then
 				if [ -z "$TG_RECURSIVE" ]; then
-					resume="\`$tg update\` again"
+					resume="\`git checkout $name && $tg update\` again"
 				else # subshell
 					resume='exit'
 				fi
-- 
2.30.2