comparison 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
comparison
equal deleted inserted replaced
10260:fe699ca08a45 10264:d6512b3e9ac0
953 Copying 953 Copying
954 ------- 954 -------
955 This manual page is copyright 2005 Bryan O'Sullivan. 955 This manual page is copyright 2005 Bryan O'Sullivan.
956 Mercurial is copyright 2005-2010 Matt Mackall. 956 Mercurial is copyright 2005-2010 Matt Mackall.
957 Free use of this software is granted under the terms of the GNU General 957 Free use of this software is granted under the terms of the GNU General
958 Public License version 2. 958 Public License version 2 or any later version.
959 959
960 .. include:: common.txt 960 .. include:: common.txt