diff -r 063628423fd1 -r 7ada34676db8 mercurial/help.py
--- a/mercurial/help.py	Wed Aug 13 19:28:42 2014 +0900
+++ b/mercurial/help.py	Wed Aug 13 19:38:47 2014 +0900
@@ -236,10 +236,12 @@
 
         # check if it's an invalid alias and display its error if it is
         if getattr(entry[0], 'badalias', None):
-            if not unknowncmd:
-                ui.pushbuffer()
-                entry[0](ui)
-                rst.append(ui.popbuffer())
+            rst.append(entry[0].badalias + '\n')
+            if entry[0].unknowncmd:
+                try:
+                    rst.extend(helpextcmd(entry[0].cmdname))
+                except error.UnknownCommand:
+                    pass
             return rst
 
         # synopsis