--- a/mercurial/merge.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/merge.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # 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.
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2, incorporated herein by reference.
 
 from node import nullid, nullrev, hex, bin
 from i18n import _