Mercurial > hg-stable
diff mercurial/policy.py @ 39471:481db51c83e9
merge with stable
Includes an extra bump of the version number for parsers because the
merge produces a new, distinct version of the code.
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Wed, 05 Sep 2018 09:36:31 -0700 |
| parents | 7a759ad2d06d adacefb0b7ea |
| children | f2342483f7a6 |
line wrap: on
line diff
--- a/mercurial/policy.py Tue Sep 04 10:22:42 2018 -0700 +++ b/mercurial/policy.py Wed Sep 05 09:36:31 2018 -0700 @@ -69,7 +69,7 @@ (r'cext', r'bdiff'): 3, (r'cext', r'mpatch'): 1, (r'cext', r'osutil'): 4, - (r'cext', r'parsers'): 9, + (r'cext', r'parsers'): 11, } # map import request to other package or module