diff -r 40335bd603f6 -r 20e6442c6cee components/mercurial/patches/hgmanpage.patch
--- a/components/mercurial/patches/hgmanpage.patch	Wed Apr 19 03:24:59 2017 -0700
+++ b/components/mercurial/patches/hgmanpage.patch	Fri Apr 21 10:43:44 2017 -0700
@@ -21,9 +21,9 @@
 (found in rst.patch) with the patched hgmanpage.py, and updates the
 manpage.patch file.
 
---- mercurial-2.7/doc/hgmanpage.py	Thu Aug  1 20:37:39 2013
-+++ mercurial-2.7/doc/hgmanpage.py	Mon Aug 19 14:40:04 2013
-@@ -197,6 +197,7 @@
+--- mercurial.hg/doc/hgmanpage.py	2016-10-09 20:00:17.207404849 -0700
++++ mercurial.hg/doc/hgmanpage.py	2016-10-10 10:04:03.695820057 -0700
+@@ -202,6 +202,7 @@
          self._in_docinfo = None
          self._active_table = None
          self._in_literal = False
@@ -31,7 +31,7 @@
          self.header_written = 0
          self._line_block = 0
          self.authors = []
-@@ -212,15 +213,15 @@
+@@ -217,15 +218,15 @@
          # ``B`` bold, ``I`` italic, ``R`` roman should be available.
          # Hopefully ``C`` courier too.
          self.defs = {
@@ -50,7 +50,7 @@
                  'emphasis': ('\\fI', '\\fP'),
                  'strong' : ('\\fB', '\\fP'),
                  'term' : ('\n.B ', '\n'),
-@@ -267,6 +268,7 @@
+@@ -272,6 +273,7 @@
                      self.body[i - 2][:4] == '.TP\n'):
                      self.body[i] = '.\n'
                  elif (self.body[i - 1] == '\n' and
@@ -58,15 +58,15 @@
                      self.body[i - 2][0] != '.' and
                      (self.body[i - 3][:7] == '.TP\n.B '
                          or self.body[i - 3][:4] == '\n.B ')
-@@ -284,7 +286,6 @@
+@@ -289,7 +291,6 @@
          text = text.replace('\\','\\e')
          replace_pairs = [
-             (u'-', ur'\-'),
--            (u'\'', ur'\(aq'),
-             (u'´', ur'\''),
-             (u'`', ur'\(ga'),
+             (u'-', u'\\-'),
+-            (u"'", u'\\(aq'),
+             (u'´', u"\\'"),
+             (u'`', u'\\(ga'),
              ]
-@@ -297,6 +298,15 @@
+@@ -302,6 +303,15 @@
              if text[0] == '.':
                  text = '\\&' + text
              text = text.replace('\n.', '\n\\&.')
@@ -82,7 +82,7 @@
          self.body.append(text)
  
      def depart_Text(self, node):
-@@ -381,7 +391,6 @@
+@@ -386,7 +396,6 @@
          if self.header_written:
              return
          self.body.append(self.header())
@@ -90,7 +90,7 @@
          self.header_written = 1
  
      def visit_address(self, node):
-@@ -795,8 +804,10 @@
+@@ -800,8 +809,10 @@
  
      def visit_literal(self, node):
          self.body.append(self.defs['literal'][0])