mercurial/dispatch.py

--- a/mercurial/dispatch.py	Tue Aug 02 15:21:10 2011 -0400
+++ b/mercurial/dispatch.py	Thu Aug 04 15:08:41 2011 -0500
@@ -622,10 +622,10 @@
         for ui_ in uis:
             ui_.setconfig('web', 'cacerts', '')
 
+    if options['version']:
+        return commands.version_(ui)
     if options['help']:
-        return commands.help_(ui, cmd, options['version'])
-    elif options['version']:
-        return commands.version_(ui)
+        return commands.help_(ui, cmd)
     elif not cmd:
         return commands.help_(ui, 'shortlist')