merge with 3.3

birkenfeld · birkenfeld · commit 650781411ec0 · 2014-03-09T10:22:46.000+01:00
diff --git 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]")
 }

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,6 @@ def touch(ui, repo, basedir):`
`125`	`125`
`126`	`126`	`cmdtable = {`
`127`	`127`	`"touch": (touch,`
`128`		`- [('b', 'basedir', '', 'base dir of the tree to apply touching', 'BASEDIR')],`
	`128`	`+ [('b', 'basedir', '', 'base dir of the tree to apply touching')],`
`129`	`129`	`"hg touch [-b BASEDIR]")`
`130`	`130`	`}`