diff options
| author | isaacs <i@izs.me> | 2012-05-09 15:12:13 -0700 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2012-05-09 15:12:13 -0700 |
| commit | 07be9fc3a674d8a2e148041f3674c1abaee0907f (patch) | |
| tree | b4075cce21b1a5697420a45388bb884bc71418d9 /test/message/throw_non_error.out | |
| parent | 5979f096d1b702ca2ba95664a0bbc8210109775b (diff) | |
| parent | bf9d8e9214e2098bacf18416564dc3a91bcdf5d6 (diff) | |
| download | android-node-v8-07be9fc3a674d8a2e148041f3674c1abaee0907f.tar.gz android-node-v8-07be9fc3a674d8a2e148041f3674c1abaee0907f.tar.bz2 android-node-v8-07be9fc3a674d8a2e148041f3674c1abaee0907f.zip | |
Merge remote-tracking branch 'ry/v0.6' into v0.6-merge
Conflicts:
Makefile
lib/zlib.js
src/node.cc
src/node.js
Diffstat (limited to 'test/message/throw_non_error.out')
| -rw-r--r-- | test/message/throw_non_error.out | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/message/throw_non_error.out b/test/message/throw_non_error.out index 477b13cd8a..23e3d928e8 100644 --- a/test/message/throw_non_error.out +++ b/test/message/throw_non_error.out @@ -1,6 +1,6 @@ before -node.js:* - throw e; // process.nextTick error, or 'error' event on first tick - ^ +*/test/message/throw_non_error.js:31 +throw ({ foo: 'bar' }); +^ [object Object] |