--- a/mercurial/help/subrepos.txt Tue Feb 15 16:19:11 2011 -0600
+++ b/mercurial/help/subrepos.txt Tue Feb 15 22:25:48 2011 +0100
@@ -78,7 +78,10 @@
:commit: commit creates a consistent snapshot of the state of the
entire project and its subrepositories. It does this by first
attempting to commit all modified subrepositories, then recording
- their state and finally committing it in the parent repository.
+ their state and finally committing it in the parent
+ repository. Mercurial can be made to abort if any subrepository
+ content is modified by setting "ui.commitsubrepos=no" in a
+ configuration file (see :hg:`help config`).
:diff: diff does not recurse in subrepos unless -S/--subrepos is
specified. Changes are displayed as usual, on the subrepositories