[pypy-commit] pypy default: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r97242:bacea0b28bb3
Date: 2019-08-22 13:15 +0200
http://bitbucket.org/pypy/pypy/changeset/bacea0b28bb3/

Log:	merge heads

diff --git a/pypy/interpreter/app_main.py b/pypy/interpreter/app_main.py
--- a/pypy/interpreter/app_main.py
+++ b/pypy/interpreter/app_main.py
@@ -226,6 +226,8 @@
     print '    turn off the JIT'
     print ' help'
     print '    print this page'
+    print
+    print 'The "pypyjit" module can be used to control the JIT from inside python'
 
 def print_version(*args):
     print >> sys.stderr, "Python", sys.version