Mercurial > hg-stable
changeset 10207:f5e55f1ca927
Merge with stable
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Mon, 04 Jan 2010 01:11:18 +0100 |
| parents | 45885e8f5704 (current diff) 8b5ca9b9b435 (diff) |
| children | 37c4ce51a12d |
| files | mercurial/commands.py tests/test-help.out |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Sun Jan 03 19:13:55 2010 +0100 +++ b/mercurial/commands.py Mon Jan 04 01:11:18 2010 +0100 @@ -3213,7 +3213,7 @@ ui.write(_("Mercurial Distributed SCM (version %s)\n") % util.version()) ui.status(_( - "\nCopyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n" + "\nCopyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n" "This is free software; see the source for copying conditions. " "There is NO\nwarranty; " "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
--- a/tests/test-help.out Sun Jan 03 19:13:55 2010 +0100 +++ b/tests/test-help.out Mon Jan 04 01:11:18 2010 +0100 @@ -173,7 +173,7 @@ %% test short command list with verbose option Mercurial Distributed SCM (version xxx) -Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others +Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -253,7 +253,7 @@ %% test help option with version option Mercurial Distributed SCM (version xxx) -Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others +Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.