diff mercurial/patch.py @ 10264:d6512b3e9ac0

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 19 Jan 2010 22:45:09 -0600
parents 3ca8f2ae5fee 25e572394f5c
children 08a0f04b56bd
line wrap: on
line diff
--- a/mercurial/patch.py	Mon Jan 18 22:59:32 2010 +0100
+++ b/mercurial/patch.py	Tue Jan 19 22:45:09 2010 -0600
@@ -4,7 +4,7 @@
 # Copyright 2007 Chris Mason <chris.mason@oracle.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 i18n import _
 from node import hex, nullid, short