changeset 1326:15c313b60567

Merge stable back into default.
author Augie Fackler <raf@durin42.com>
date Fri, 08 May 2015 14:11:14 -0400
parents fd3461f86582 (current diff) 82803ec84c82 (diff)
children 72fe317a7b94
files
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags
+++ b/.hgtags
@@ -15,3 +15,4 @@ 36f6d51b4edc31f1f9ce2d0d02965a85dd26a455
 46523cdfd3b0cee0bf1366ab587686bb65211747 1.6.3
 139a44a63090b2c0f8e05d7d1104d3d9c9e26f57 1.7
 c1756971f8828a59c859513f208c6d79bf34c275 1.8
+dde1ade36a49d3d0e1b4b8bd384a6797665b5081 1.8.1
--- 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