diff --git a/doc/hgmerge.1.txt b/doc/hgmerge.1.txt --- a/doc/hgmerge.1.txt +++ b/doc/hgmerge.1.txt @@ -30,6 +30,6 @@ hg(1) - the command line interface to Me COPYING ------- -Copyright \(C) 2005 Matt Mackall. +Copyright \(C) 2005, 2006 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License (GPL).