summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-03-09 09:22:46 (GMT)
committerGeorg Brandl <georg@python.org>2014-03-09 09:22:46 (GMT)
commit650781411ec0471a41e85594871924edf4bc93ac (patch)
tree610eda4bab07e4835a46ff1206d0a9feabfd5011 /Tools
parent958e4da6603762858b1e9134d892b6a2d1fe2649 (diff)
parente46abb42deeffd535e926337a1507f604252a816 (diff)
downloadcpython-650781411ec0471a41e85594871924edf4bc93ac.zip
cpython-650781411ec0471a41e85594871924edf4bc93ac.tar.gz
cpython-650781411ec0471a41e85594871924edf4bc93ac.tar.bz2
merge with 3.3
Diffstat (limited to 'Tools')
-rw-r--r--Tools/hg/hgtouch.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Tools/hg/hgtouch.py b/Tools/hg/hgtouch.py
index cd990b3..119d812 100644
--- a/Tools/hg/hgtouch.py
+++ b/Tools/hg/hgtouch.py
@@ -125,6 +125,6 @@ def touch(ui, repo, basedir):
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]")
}