[pypy-commit] pypy py3k-faulthandler: hg merge default

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: py3k-faulthandler
Changeset: r87495:4cc420d0f7f8
Date: 2016-10-01 12:19 +0200
http://bitbucket.org/pypy/pypy/changeset/4cc420d0f7f8/

Log:	hg merge default

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
@@ -31,6 +31,7 @@
 arg ...: arguments passed to program in sys.argv[1:]
 PyPy options and arguments:
 --info : print translation information about this PyPy executable
+-X faulthandler: attempt to display tracebacks when PyPy crashes
 """
 # Missing vs CPython: PYTHONHOME
 USAGE2 = """