diff doc/hgrc.5.txt @ 10212:3ab391dd5ec5

Merge with stable.
author Martin Geisler <mg@lazybytes.net>
date Tue, 05 Jan 2010 22:41:39 +0100
parents d8214e944b84 a474f950357b
children d6512b3e9ac0
line wrap: on
line diff
--- a/doc/hgrc.5.txt	Tue Jan 05 10:20:28 2010 -0600
+++ b/doc/hgrc.5.txt	Tue Jan 05 22:41:39 2010 +0100
@@ -202,6 +202,7 @@
 For example, to match any file ending in ``.txt`` in the root
 directory only, use the pattern ``*.txt``. To match any file ending
 in ``.c`` anywhere in the repository, use the pattern ``**.c``.
+For each file only the first matching filter applies.
 
 The filter command can start with a specifier, either ``pipe:`` or
 ``tempfile:``. If no specifier is given, ``pipe:`` is used by default.
@@ -952,7 +953,7 @@
 Copying
 -------
 This manual page is copyright 2005 Bryan O'Sullivan.
-Mercurial is copyright 2005-2009 Matt Mackall.
+Mercurial is copyright 2005-2010 Matt Mackall.
 Free use of this software is granted under the terms of the GNU General
 Public License version 2.