doc/hgmerge.1.txt
changeset 2858 345bac2bc4ec
parent 1341 3ab6e55ee361
child 4635 63b9d2deed48
--- 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).