[Python-checkins] cpython: Fixed incorrect merge in 1638360eea41.
serhiy.storchaka
python-checkins at python.org
Sun Jan 12 11:03:03 CET 2014
http://hg.python.org/cpython/rev/0a17b76ec4e4
changeset: 88422:0a17b76ec4e4
user: Serhiy Storchaka <storchaka at gmail.com>
date: Sun Jan 12 12:01:13 2014 +0200
summary:
Fixed incorrect merge in 1638360eea41.
files:
Misc/NEWS | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -25,14 +25,10 @@
Library
-------
-<<<<<<< local
-- Issue #20152: Ported Python/import.c over to Argument Clinic.
-=======
- Issue #19097: Raise the correct Exception when cgi.FieldStorage is given an
Invalid fileobj.
-- Issue #20217: Fix build in SCHED_SPORADIC is defined.
->>>>>>> other
+- Issue #20152: Ported Python/import.c over to Argument Clinic.
- Issue #13107: argparse and optparse no longer raises an exception when output
a help on environment with too small COLUMNS. Based on patch by
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list