--- a/mercurial/commands.py	Mon Mar 24 22:49:33 2008 +0100
+++ b/mercurial/commands.py	Mon Mar 24 15:36:56 2008 -0700
@@ -539,6 +539,9 @@
     If a list of files is omitted, all changes reported by "hg status"
     will be committed.
 
+    If you are committing the result of a merge, do not provide any
+    file names or -I/-X filters.
+
     If no commit message is specified, the configured editor is started to
     enter a message.