summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-10 06:51:21 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-10 06:51:21 (GMT)
commiteb0e0024b746a8ab6596928c792e002217ef334b (patch)
tree10723bff18126bd208d97220830af05e122bbda8
parent96ce6d2607449a439ee30644465507eb5a6e1938 (diff)
downloadgit-eb0e0024b746a8ab6596928c792e002217ef334b.zip
git-eb0e0024b746a8ab6596928c792e002217ef334b.tar.gz
git-eb0e0024b746a8ab6596928c792e002217ef334b.tar.bz2
Fix t1200 test for breakage caused by removal of full-stop at the end of fast-forward message.
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xt/t1200-tutorial.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh
index c8a85f9..1002413 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(-)