Mercurial > public > mercurial-scm > hg

diff tests/run-tests.py @ 42918:f059d6ffcdf0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Augie Fackler <augie@google.com>
date Mon, 09 Sep 2019 17:26:17 -0400
parents 75bd5990d8fe 344a086bb764
children e360acfaf210
line wrap: on
line diff
--- a/tests/run-tests.py	Mon Sep 09 12:56:17 2019 -0700
+++ b/tests/run-tests.py	Mon Sep 09 17:26:17 2019 -0400
@@ -2538,6 +2538,7 @@
                 b'check': 100,
                 b'gendoc': 100,
                 b'contrib-perf': 200,
+                b'merge-combination': 100,
                 }
         perf = {}