Mercurial > hg

diff mercurial/merge.py @ 10263:25e572394f5c stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update license to GPLv2+
author Matt Mackall <mpm@selenic.com>
date Tue, 19 Jan 2010 22:20:08 -0600
parents ee00ef6f9be7
children 08a0f04b56bd
line wrap: on
line diff
--- a/mercurial/merge.py	Tue Jan 19 22:20:05 2010 -0600
+++ b/mercurial/merge.py	Tue Jan 19 22:20:08 2010 -0600
@@ -3,7 +3,7 @@
 # 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 version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
 
 from node import nullid, nullrev, hex, bin
 from i18n import _