comparison doc/hgmerge.1.txt @ 2859:345bac2bc4ec

update copyrights.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sat, 12 Aug 2006 12:30:02 -0700
parents 3ab6e55ee361
children
comparison
equal deleted inserted replaced
2858:c9b08cacf983 2859:345bac2bc4ec
28 -------- 28 --------
29 hg(1) - the command line interface to Mercurial SCM 29 hg(1) - the command line interface to Mercurial SCM
30 30
31 COPYING 31 COPYING
32 ------- 32 -------
33 Copyright \(C) 2005 Matt Mackall. 33 Copyright \(C) 2005, 2006 Matt Mackall.
34 Free use of this software is granted under the terms of the GNU General 34 Free use of this software is granted under the terms of the GNU General
35 Public License (GPL). 35 Public License (GPL).