Mercurial > public > mercurial-scm > hg-stable

diff mercurial/filemerge.py @ 8225:46293a0c7e9f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated license to be explicit about GPL version 2
author Martin Geisler <mg@lazybytes.net>
date Sun, 26 Apr 2009 01:08:54 +0200
parents a1a5a57efe90
children 98acfd1d2b08
line wrap: on
line diff
--- a/mercurial/filemerge.py	Mon Apr 27 16:29:26 2009 +0200
+++ b/mercurial/filemerge.py	Sun Apr 26 01:08:54 2009 +0200
@@ -2,8 +2,8 @@
 #
 # Copyright 2006, 2007, 2008 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 short
 from i18n import _