Mercurial > hg > mercurial-crew-with-dirclash

diff doc/hgrc.5.txt @ 1929:85daa4e03b4c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merging with crew.
author Eric Hopper <hopper@omnifarious.org>
date Mon, 06 Mar 2006 08:47:16 -0800
parents 750b9cd83965
children 7718885070b1
line wrap: on
line diff
--- a/doc/hgrc.5.txt
+++ b/doc/hgrc.5.txt
@@ -247,6 +247,9 @@ ui::
     remote command to use for clone/push/pull operations. Default is 'hg'.
   ssh;;
     command to use for SSH connections. Default is 'ssh'.
+  timeout;;
+    The timeout used when a lock is held (in seconds), a negative value
+    means no timeout. Default is 600.
   username;;
     The committer of a changeset created when running "commit".
     Typically a person's name and email address, e.g. "Fred Widget