From eb0e0024b746a8ab6596928c792e002217ef334b Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 9 Mar 2006 22:51:21 -0800 Subject: [PATCH] Fix t1200 test for breakage caused by removal of full-stop at the end of fast-forward message. Signed-off-by: Junio C Hamano --- t/t1200-tutorial.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh index c8a85f92dd..10024133e3 100755 --- a/t/t1200-tutorial.sh +++ b/t/t1200-tutorial.sh @@ -128,7 +128,7 @@ test_expect_success 'git show-branch' 'cmp show-branch.expect show-branch.output git checkout mybranch cat > resolve.expect << EOF -Updating from VARIABLE to VARIABLE. +Updating from VARIABLE to VARIABLE example | 1 + hello | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)