--- a/mercurial/help/config.txt Sat Aug 16 10:19:26 2014 -0700
+++ b/mercurial/help/config.txt Sat Aug 16 10:43:59 2014 +0900
@@ -395,7 +395,8 @@
- ``changeset.backout`` for :hg:`backout`
- ``changeset.commit.amend`` for :hg:`commit --amend`
-- ``changeset.commit.normal`` for :hg:`commit` without ``--amend``
+- ``changeset.commit.normal.merge`` for :hg:`commit` on merges
+- ``changeset.commit.normal.normal`` for :hg:`commit` on other
- ``changeset.fetch`` for :hg:`fetch` (impling merge commit)
- ``changeset.gpg.sign`` for :hg:`sign`
- ``changeset.graft`` for :hg:`graft`
@@ -422,7 +423,7 @@
At the external editor invocation for committing, corresponding
dot-separated list of names without ``changeset.`` prefix
-(e.g. ``commit.normal``) is in ``HGEDITFORM`` environment variable.
+(e.g. ``commit.normal.normal``) is in ``HGEDITFORM`` environment variable.
In this section, items other than ``changeset`` can be referred from
others. For example, the configuration to list committed files up