diff 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
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Feb 13 02:31:56 2017 -0800
+++ b/mercurial/commands.py	Mon Feb 13 09:44:16 2017 -0800
@@ -6583,7 +6583,7 @@
              util.version())
     license = _(
         "(see https://mercurial-scm.org for more information)\n"
-        "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
+        "\nCopyright (C) 2005-2017 Matt Mackall 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"