[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3

[georg.brandl]

http://hg.python.org/cpython/rev/c88553c48d76
changeset:   89517:c88553c48d76
parent:      89515:fd53f083768c
parent:      89516:6e9827ba455f
user:        Georg Brandl <georg at python.org>
date:        Sun Mar 09 10:22:46 2014 +0100
summary:
  merge with 3.3

files:
  Tools/hg/hgtouch.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Tools/hg/hgtouch.py b/Tools/hg/hgtouch.py
--- a/Tools/hg/hgtouch.py
+++ b/Tools/hg/hgtouch.py
@@ -125,6 +125,6 @@
 
 cmdtable = {
     "touch": (touch,
-              [('b', 'basedir', '', 'base dir of the tree to apply touching', 'BASEDIR')],
+              [('b', 'basedir', '', 'base dir of the tree to apply touching')],
               "hg touch [-b BASEDIR]")
 }

-- 
Repository URL: http://hg.python.org/cpython