comparison mercurial/commands.py @ 10207:f5e55f1ca927

Merge with stable
author Martin Geisler <mg@lazybytes.net>
date Mon, 04 Jan 2010 01:11:18 +0100
parents 56284451a22c 8b5ca9b9b435
children 3ab391dd5ec5
comparison
equal deleted inserted replaced
10205:45885e8f5704 10207:f5e55f1ca927
3211 def version_(ui): 3211 def version_(ui):
3212 """output version and copyright information""" 3212 """output version and copyright information"""
3213 ui.write(_("Mercurial Distributed SCM (version %s)\n") 3213 ui.write(_("Mercurial Distributed SCM (version %s)\n")
3214 % util.version()) 3214 % util.version())
3215 ui.status(_( 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 "This is free software; see the source for copying conditions. " 3217 "This is free software; see the source for copying conditions. "
3218 "There is NO\nwarranty; " 3218 "There is NO\nwarranty; "
3219 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" 3219 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
3220 )) 3220 ))
3221 3221