Mercurial > public > mercurial-scm > hg-stable
diff mercurial/subrepo.py @ 10264:d6512b3e9ac0
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 19 Jan 2010 22:45:09 -0600 |
parents | 0bc93fa2cf2b 25e572394f5c |
children | 9b38bec5dc29 |
line wrap: on
line diff
--- a/mercurial/subrepo.py Mon Jan 18 22:59:32 2010 +0100 +++ b/mercurial/subrepo.py Tue Jan 19 22:45:09 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. import errno, os, re from i18n import _