diff -r 2896d450fec4 -r af15de6775c7 tests/test-help.t
--- a/tests/test-help.t	Fri Aug 01 02:14:24 2014 +0900
+++ b/tests/test-help.t	Thu Jul 31 14:31:31 2014 -0500
@@ -862,6 +862,17 @@
   *"hg -v help debugoptDEP"* (glob)
 #endif
 
+Test commands that collide with topics (issue4240)
+
+  $ hg config -hq
+  hg config [-u] [NAME]...
+  
+  show combined config settings from all hgrc files
+  $ hg showconfig -hq
+  hg config [-u] [NAME]...
+  
+  show combined config settings from all hgrc files
+
 Test a help topic
 
   $ hg help revs