Browse Source

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>
maint
Junio C Hamano 19 years ago
parent
commit
eb0e0024b7
  1. 2
      t/t1200-tutorial.sh

2
t/t1200-tutorial.sh

@ -128,7 +128,7 @@ test_expect_success 'git show-branch' 'cmp show-branch.expect show-branch.output @@ -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(-)

Loading…
Cancel
Save