Mercurial > hg

diff doc/hgmerge.1.txt @ 4635:63b9d2deed48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated copyright notices and add "and others" to "hg version"
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 19 Jun 2007 08:51:34 +0200
parents 345bac2bc4ec
children
line wrap: on
line diff
--- a/doc/hgmerge.1.txt	Tue Jun 19 08:17:55 2007 +0200
+++ b/doc/hgmerge.1.txt	Tue Jun 19 08:51:34 2007 +0200
@@ -30,6 +30,6 @@
 
 COPYING
 -------
-Copyright \(C) 2005, 2006 Matt Mackall.
+Copyright \(C) 2005-2007 Matt Mackall.
 Free use of this software is granted under the terms of the GNU General
 Public License (GPL).