Mercurial > hg > mercurial-crew-with-dirclash

diff doc/hgmerge.1.txt @ 3044:fcadf7a32425

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with mpm
author Josef "Jeff" Sipek <jeffpc@josefsipek.net>
date Sun, 03 Sep 2006 06:06:02 -0400
parents 345bac2bc4ec
children 63b9d2deed48
line wrap: on
line diff
--- 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).