diff -r 73bf2b586f3f -r 63b9d2deed48 mercurial/merge.py
--- a/mercurial/merge.py	Tue Jun 19 08:17:55 2007 +0200
+++ b/mercurial/merge.py	Tue Jun 19 08:51:34 2007 +0200
@@ -1,6 +1,6 @@
 # merge.py - directory-level update/merge handling for Mercurial
 #
-# Copyright 2006 Matt Mackall <mpm@selenic.com>
+# Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.