##// END OF EJS Templates
Merge with stable
Martin Geisler -
r10207:f5e55f1c merge default
parent child Browse files
Show More
@@ -3213,7 +3213,7 b' def version_(ui):'
3213 3213 ui.write(_("Mercurial Distributed SCM (version %s)\n")
3214 3214 % util.version())
3215 3215 ui.status(_(
3216 "\nCopyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others\n"
3216 "\nCopyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
3217 3217 "This is free software; see the source for copying conditions. "
3218 3218 "There is NO\nwarranty; "
3219 3219 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -173,7 +173,7 b' additional help topics:'
173 173 %% test short command list with verbose option
174 174 Mercurial Distributed SCM (version xxx)
175 175
176 Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others
176 Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others
177 177 This is free software; see the source for copying conditions. There is NO
178 178 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
179 179
@@ -253,7 +253,7 b' use "hg -v help add" to show global opti'
253 253 %% test help option with version option
254 254 Mercurial Distributed SCM (version xxx)
255 255
256 Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others
256 Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others
257 257 This is free software; see the source for copying conditions. There is NO
258 258 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
259 259
General Comments 0
You need to be logged in to leave comments. Login now