daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict in doc/api/readline.markdown

pull/24503/head
isaacs 2012-03-13 09:16:39 -07:00
parent c15e6905c4
commit 943c396b86
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/api/readline.markdown
View File

@ -52,12 +52,9 @@ Sets the prompt, for example when you run `node` on the command line, you see
Readies readline for input from the user, putting the current `setPrompt` Readies readline for input from the user, putting the current `setPrompt`
options on a new line, giving the user a new spot to write. options on a new line, giving the user a new spot to write.
<<<<<<< HEAD
This will also resume the `in` stream used with `createInterface` if it has This will also resume the `in` stream used with `createInterface` if it has
been paused. been paused.
=======
>>>>>>> ry/v0.6
### rl.question(query, callback) ### rl.question(query, callback)
Prepends the prompt with `query` and invokes `callback` with the user's Prepends the prompt with `query` and invokes `callback` with the user's