# HG changeset patch
# User Dmitry Neverov <dmitry.neverov@gmail.com>
# Date 1498128921 -7200
# Node ID 1f9c8d7f3a121dcf66d3e03da28c9af7ab8db368
# Parent  ea15ebd45ba41430d14a1304440cbdb4ff490858# Parent  c5dc2c802e4b3d3e1145e745394f4d9234ba9076
Merge branch Indore-2017.1.x

diff -r ea15ebd45ba4 -r 1f9c8d7f3a12 mercurial-common/src/python/load-commands-command.py
--- a/mercurial-common/src/python/load-commands-command.py	Tue Jun 13 11:01:29 2017 +0200
+++ b/mercurial-common/src/python/load-commands-command.py	Thu Jun 22 12:55:21 2017 +0200
@@ -52,5 +52,5 @@
 commands.norepo += " CMD"
 
 testedwith = '2.2.2'
-buglink = "@jonnyzzz"
+buglink = "upsource-support@jetbrains.com"
 
diff -r ea15ebd45ba4 -r 1f9c8d7f3a12 mercurial-common/src/python/load-substates-command.py
--- a/mercurial-common/src/python/load-substates-command.py	Tue Jun 13 11:01:29 2017 +0200
+++ b/mercurial-common/src/python/load-substates-command.py	Thu Jun 22 12:55:21 2017 +0200
@@ -143,6 +143,10 @@
     "load-substates": (load_substates_command, [ ], " [options] OUTPUT_FILE")
 }
 
-testedwith = '2.2.2'
-buglink = "@jonnyzzz"
+load_substates_command.norepo = False
+load_substates_command.optionalrepo = False
+load_substates_command.inferrepo = False
 
+testedwith = '4.2.1'
+buglink = "upsource-support@jetbrains.com"
+