# HG changeset patch # User Augie Fackler # Date 1431108674 14400 # Node ID 15c313b6056709b82ab11d80de3f02b89a268577 # Parent fd3461f865826f682202fe199715bd343266630a# Parent 82803ec84c826c0ab155ec7f3283e37fd5e2551b Merge stable back into default. diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -15,3 +15,4 @@ 36f6d51b4edc31f1f9ce2d0d02965a85dd26a455 46523cdfd3b0cee0bf1366ab587686bb65211747 1.6.3 139a44a63090b2c0f8e05d7d1104d3d9c9e26f57 1.7 c1756971f8828a59c859513f208c6d79bf34c275 1.8 +dde1ade36a49d3d0e1b4b8bd384a6797665b5081 1.8.1 diff --git a/hgsubversion/help/subversion.rst b/hgsubversion/help/subversion.rst --- a/hgsubversion/help/subversion.rst +++ b/hgsubversion/help/subversion.rst @@ -407,7 +407,7 @@ The following options only have an effec you use this option, be sure to carefully check the result of a pull afterwards. - ``hgsubversionbranch.*`` + ``hgsubversionbranch.*`` Use this config section with the custom layout to specify a cusomt mapping of subversion path to Mercurial branch. This is useful if