Bitbucket cannot automatically merge this request.
The commits that make up this pull request have been removed.
Bitbucket cannot automatically merge this request due to conflicts.
Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:
hg update default
hg pull -r 72f99790dd46 https://bitbucket.org/ajford/flask-script
hg merge 72f99790dd46
hg commit -m 'Merged in ajford/flask-script (pull request #4)'
Added support for the bpython interpreter. For more info on bpython check out http://www.bpython-interpreter.org/
The changes leaves ipython the default, as before, but adds a new flag --bpython. I tried to leave all existing logic alone, and minimize the number of changes.