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>
This commit is contained in:
@ -128,7 +128,7 @@ test_expect_success 'git show-branch' 'cmp show-branch.expect show-branch.output
|
|||||||
git checkout mybranch
|
git checkout mybranch
|
||||||
|
|
||||||
cat > resolve.expect << EOF
|
cat > resolve.expect << EOF
|
||||||
Updating from VARIABLE to VARIABLE.
|
Updating from VARIABLE to VARIABLE
|
||||||
example | 1 +
|
example | 1 +
|
||||||
hello | 1 +
|
hello | 1 +
|
||||||
2 files changed, 2 insertions(+), 0 deletions(-)
|
2 files changed, 2 insertions(+), 0 deletions(-)
|
||||||
|
Reference in New Issue
Block a user