comparison doc/hgrc.5.txt @ 9602:fc493cb90bb1

Merge with redone c655432c2c24 (issue1860)
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 16 Oct 2009 11:19:39 +0200
parents ceb0f59e1327
children 585d2ffe969b
comparison
equal deleted inserted replaced
9601:11ace5726d02 9602:fc493cb90bb1
944 COPYING 944 COPYING
945 ------- 945 -------
946 This manual page is copyright 2005 Bryan O'Sullivan. 946 This manual page is copyright 2005 Bryan O'Sullivan.
947 Mercurial is copyright 2005-2009 Matt Mackall. 947 Mercurial is copyright 2005-2009 Matt Mackall.
948 Free use of this software is granted under the terms of the GNU General 948 Free use of this software is granted under the terms of the GNU General
949 Public License (GPL). 949 Public License version 2.
950 950
951 .. include:: common.txt 951 .. include:: common.txt