From: Junio C Hamano Date: Fri, 10 Mar 2006 06:51:21 +0000 (-0800) Subject: Fix t1200 test for breakage caused by removal of full-stop at the end of fast-forward... X-Git-Tag: v1.3.0-rc1~13^2~7 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eb0e0024b746a8ab6596928c792e002217ef334b;p=git.git Fix t1200 test for breakage caused by removal of full-stop at the end of fast-forward message. Signed-off-by: Junio C Hamano --- diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh index c8a85f92d..10024133e 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(-)