comparison mercurial/commands.py @ 30916:455677a7667f

merge with stable
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 13 Feb 2017 09:44:16 -0800
parents a8786013f056 75149f84eac7
children fec3dbaa7f83
comparison
equal deleted inserted replaced
30906:72f25e17af9d 30916:455677a7667f
6581 fm.startitem() 6581 fm.startitem()
6582 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"), 6582 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
6583 util.version()) 6583 util.version())
6584 license = _( 6584 license = _(
6585 "(see https://mercurial-scm.org for more information)\n" 6585 "(see https://mercurial-scm.org for more information)\n"
6586 "\nCopyright (C) 2005-2016 Matt Mackall and others\n" 6586 "\nCopyright (C) 2005-2017 Matt Mackall and others\n"
6587 "This is free software; see the source for copying conditions. " 6587 "This is free software; see the source for copying conditions. "
6588 "There is NO\nwarranty; " 6588 "There is NO\nwarranty; "
6589 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" 6589 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6590 ) 6590 )
6591 if not ui.quiet: 6591 if not ui.quiet: