| branch | stable |
| changeset 10263 | 25e572394f5c |
| parent 9709 | 5858117a0077 |
| child 10282 | 08a0f04b56bd |
--- a/mercurial/filemerge.py Tue Jan 19 22:20:05 2010 -0600 +++ b/mercurial/filemerge.py Tue Jan 19 22:20:08 2010 -0600 @@ -3,7 +3,7 @@ # 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 version 2, incorporated herein by reference. +# GNU General Public License version 2 or any later version. from node import short from i18n import _