merge with 3.3

This commit is contained in:
Georg Brandl 2013-10-06 18:58:03 +02:00
commit 434bdf413f

View file

@ -2159,8 +2159,6 @@ features:
- If *times* and *ns* are both ``None``,
this is equivalent to specifying ``ns=(atime_ns, mtime_ns)``
where both times are the current time.
(The effect is similar to running the Unix program
:program:`touch` on *path*.)
It is an error to specify tuples for both *times* and *ns*.