diff doc/hgrc.5.txt @ 10264:d6512b3e9ac0

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 19 Jan 2010 22:45:09 -0600
parents 3ab391dd5ec5 25e572394f5c
children 61f4ea277f23
line wrap: on
line diff
--- a/doc/hgrc.5.txt	Mon Jan 18 22:59:32 2010 +0100
+++ b/doc/hgrc.5.txt	Tue Jan 19 22:45:09 2010 -0600
@@ -955,6 +955,6 @@
 This manual page is copyright 2005 Bryan O'Sullivan.
 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.
+Public License version 2 or any later version.
 
 .. include:: common.txt