summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2013-03-28 14:35:02 +0800
committerXinchen Hui <laruence@gmail.com>2013-03-28 14:35:02 +0800
commit7dd661d0cdd49aece19d707bb46ab010f7e21e1e (patch)
treec4cb08db8b5cd3273e4af36a94f4c7bb2db361e2 /sapi
parentae71c1d9aa84dd400497400e58e45f24a4702602 (diff)
parentab089611e0fa5dc61030a01d17e71a10714f061a (diff)
downloadphp-git-7dd661d0cdd49aece19d707bb46ab010f7e21e1e.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
Diffstat (limited to 'sapi')
-rw-r--r--sapi/cli/tests/bug64529.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/cli/tests/bug64529.phpt b/sapi/cli/tests/bug64529.phpt
index 0c2d0e1c8b..2f0a962785 100644
--- a/sapi/cli/tests/bug64529.phpt
+++ b/sapi/cli/tests/bug64529.phpt
@@ -59,4 +59,4 @@ spawn %sphp -n -a
Interactive %s
%secho 'hello world';
-hello worl%s
+%sello worl%s