Merge branch 'master' into memory-tracking

2015-01-12 20:47:18 +00:00 · 2015-01-12 20:47:18 +00:00 · 9b4dc8d56b
commit 9b4dc8d56b
parent f440c31370 5b117ae00f
2 changed files with 2 additions and 2 deletions
--- a/test/unit/pipe-to/cmd
+++ b/test/unit/pipe-to/cmd
@ -1 +1 @@
-<a-|>sed -n "s/foo/bar/; P" > tmpfile<ret><a-!>cat tmpfile<ret>
+<a-|>sed -n "s/foo/bar/; P" > out<ret>:e! out<ret>
--- a/test/unit/pipe-to/out
+++ b/test/unit/pipe-to/out
@ -1 +1 @@
-foobarbarbar
+barbar