merge with 3.3

1fa36226 · Georg Brandl · 0d8775f1 · fbafa2f7 · 1fa36226
Commit 1fa36226 authored Mar 09, 2014 by Georg Brandl
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Tools/hg/hgtouch.py Tools/hg/hgtouch.py +1 -1

No files found.
--- 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]")
 }