diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-09 22:51:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-09 22:51:21 -0800 |
| commit | eb0e0024b746a8ab6596928c792e002217ef334b (patch) | |
| tree | 10723bff18126bd208d97220830af05e122bbda8 /t | |
| parent | 96ce6d2607449a439ee30644465507eb5a6e1938 (diff) | |
| download | git-eb0e0024b746a8ab6596928c792e002217ef334b.tar.gz git-eb0e0024b746a8ab6596928c792e002217ef334b.tar.xz | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1200-tutorial.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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(-) |