diff options
| author | Nathan Rajlich <nathan@tootallnate.net> | 2012-10-13 16:16:56 -0700 |
|---|---|---|
| committer | Nathan Rajlich <nathan@tootallnate.net> | 2012-10-13 16:16:56 -0700 |
| commit | 4b238b4c2ae8f5cf409cea5ca214b480b00e1a86 (patch) | |
| tree | 0c403c3a2f0f117bfe7230fc7bfbd197ebf78845 /deps/npm/node_modules/ini/test/foo.js | |
| parent | 47643d2ec517ceb8f7ce180142262e393c4d8e89 (diff) | |
| parent | 4a23add90f155e6761d443d1277a31c2a2a4abb2 (diff) | |
| download | node-4b238b4c2ae8f5cf409cea5ca214b480b00e1a86.tar.gz | |
Merge remote-tracking branch 'origin/v0.8'
Conflicts:
AUTHORS
ChangeLog
deps/uv/test/runner-win.c
doc/api/process.markdown
lib/repl.js
src/node_crypto.cc
src/node_version.h
Diffstat (limited to 'deps/npm/node_modules/ini/test/foo.js')
| -rw-r--r-- | deps/npm/node_modules/ini/test/foo.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/deps/npm/node_modules/ini/test/foo.js b/deps/npm/node_modules/ini/test/foo.js index 2b32bb62f..64bd22329 100644 --- a/deps/npm/node_modules/ini/test/foo.js +++ b/deps/npm/node_modules/ini/test/foo.js @@ -21,6 +21,7 @@ var i = require("../") + 'j = 2\n\n[x\\.y\\.z]\nx.y.z = xyz\n\n' + '[x\\.y\\.z.a\\.b\\.c]\n' + 'a.b.c = abc\n' + + 'nocomment = this\\; this is not a comment\n' , expectD = { o: 'p', 'a with spaces': 'b c', @@ -35,7 +36,8 @@ var i = require("../") 'x.y.z': { 'x.y.z': 'xyz', 'a.b.c': { - 'a.b.c': 'abc' + 'a.b.c': 'abc', + 'nocomment': 'this\; this is not a comment' } } } |