From caf8990914a7ac897dbda785263e249bb9158bd5 Mon Sep 17 00:00:00 2001
From: Alexander Pyhalov <apyhalov@gmail.com>
Date: Wed, 7 Mar 2018 16:56:52 +0300
Subject: [PATCH] mercurial: update to 4.5.2

---
 components/developer/mercurial/Makefile            |    4 +-
 .../mercurial/manifests/sample-manifest.p5m        |   19 +-
 components/developer/mercurial/mercurial-PYVER.p5m |   19 +-
 .../developer/mercurial/patches/manpages.patch     | 2029 ++++++++++++--------
 4 files changed, 1257 insertions(+), 814 deletions(-)

diff --git a/components/developer/mercurial/Makefile b/components/developer/mercurial/Makefile
index f9d8dd249..98e1d44fc 100644
--- a/components/developer/mercurial/Makefile
+++ b/components/developer/mercurial/Makefile
@@ -26,12 +26,12 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		mercurial
-COMPONENT_VERSION=	4.4.1
+COMPONENT_VERSION=	4.5.2
 COMPONENT_PROJECT_URL=	http://mercurial-scm.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:8f2a5512d6cc2ffb08988aef639330a2f0378e4ac3ee0e1fbbdb64d9fff56246
+    sha256:a44a9ffd1c9502a4f97298a6bbcb8a79fc8192424c760c67f17b45c12114e390
 COMPONENT_ARCHIVE_URL=	https://www.mercurial-scm.org/release/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/hg
 
diff --git a/components/developer/mercurial/manifests/sample-manifest.p5m b/components/developer/mercurial/manifests/sample-manifest.p5m
index d689b4576..7ea6a4c05 100644
--- a/components/developer/mercurial/manifests/sample-manifest.p5m
+++ b/components/developer/mercurial/manifests/sample-manifest.p5m
@@ -67,6 +67,7 @@ file path=usr/lib/python2.7/vendor-packages/hgext/fsmonitor/pywatchman/load.py
 file path=usr/lib/python2.7/vendor-packages/hgext/fsmonitor/pywatchman/pybser.py
 file path=usr/lib/python2.7/vendor-packages/hgext/fsmonitor/state.py
 file path=usr/lib/python2.7/vendor-packages/hgext/fsmonitor/watchmanclient.py
+file path=usr/lib/python2.7/vendor-packages/hgext/githelp.py
 file path=usr/lib/python2.7/vendor-packages/hgext/gpg.py
 file path=usr/lib/python2.7/vendor-packages/hgext/graphlog.py
 file path=usr/lib/python2.7/vendor-packages/hgext/hgk.py
@@ -87,6 +88,10 @@ file path=usr/lib/python2.7/vendor-packages/hgext/largefiles/reposetup.py
 file path=usr/lib/python2.7/vendor-packages/hgext/largefiles/storefactory.py
 file path=usr/lib/python2.7/vendor-packages/hgext/largefiles/uisetup.py
 file path=usr/lib/python2.7/vendor-packages/hgext/largefiles/wirestore.py
+file path=usr/lib/python2.7/vendor-packages/hgext/lfs/__init__.py
+file path=usr/lib/python2.7/vendor-packages/hgext/lfs/blobstore.py
+file path=usr/lib/python2.7/vendor-packages/hgext/lfs/pointer.py
+file path=usr/lib/python2.7/vendor-packages/hgext/lfs/wrapper.py
 file path=usr/lib/python2.7/vendor-packages/hgext/logtoprocess.py
 file path=usr/lib/python2.7/vendor-packages/hgext/mq.py
 file path=usr/lib/python2.7/vendor-packages/hgext/notify.py
@@ -102,6 +107,7 @@ file path=usr/lib/python2.7/vendor-packages/hgext/share.py
 file path=usr/lib/python2.7/vendor-packages/hgext/shelve.py
 file path=usr/lib/python2.7/vendor-packages/hgext/show.py
 file path=usr/lib/python2.7/vendor-packages/hgext/sparse.py
+file path=usr/lib/python2.7/vendor-packages/hgext/split.py
 file path=usr/lib/python2.7/vendor-packages/hgext/strip.py
 file path=usr/lib/python2.7/vendor-packages/hgext/transplant.py
 file path=usr/lib/python2.7/vendor-packages/hgext/uncommit.py
@@ -122,6 +128,7 @@ file path=usr/lib/python2.7/vendor-packages/mercurial/branchmap.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/bundle2.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/bundlerepo.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/byterange.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/cacheutil.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/cext/64/base85.so
 file path=usr/lib/python2.7/vendor-packages/mercurial/cext/64/bdiff.so
 file path=usr/lib/python2.7/vendor-packages/mercurial/cext/64/diffhelpers.so
@@ -186,6 +193,7 @@ file path=usr/lib/python2.7/vendor-packages/mercurial/help/diffs.txt
 file path=usr/lib/python2.7/vendor-packages/mercurial/help/environment.txt
 file path=usr/lib/python2.7/vendor-packages/mercurial/help/extensions.txt
 file path=usr/lib/python2.7/vendor-packages/mercurial/help/filesets.txt
+file path=usr/lib/python2.7/vendor-packages/mercurial/help/flags.txt
 file path=usr/lib/python2.7/vendor-packages/mercurial/help/glossary.txt
 file path=usr/lib/python2.7/vendor-packages/mercurial/help/hg-ssh.8.txt
 file path=usr/lib/python2.7/vendor-packages/mercurial/help/hg.1.txt
@@ -241,6 +249,7 @@ file path=usr/lib/python2.7/vendor-packages/mercurial/locale/zh_CN/LC_MESSAGES/h
 file path=usr/lib/python2.7/vendor-packages/mercurial/locale/zh_TW/LC_MESSAGES/hg.mo
 file path=usr/lib/python2.7/vendor-packages/mercurial/localrepo.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/lock.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/logexchange.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/lsprof.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/lsprofcalltree.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/mail.py
@@ -249,6 +258,7 @@ file path=usr/lib/python2.7/vendor-packages/mercurial/match.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/mdiff.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/merge.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/mergeutil.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/minifileset.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/minirst.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/namespaces.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/node.py
@@ -282,10 +292,10 @@ file path=usr/lib/python2.7/vendor-packages/mercurial/repoview.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/revlog.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/revset.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/revsetlang.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/rewriteutil.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/scmposix.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/scmutil.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/scmwindows.py
-file path=usr/lib/python2.7/vendor-packages/mercurial/selectors2.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/server.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/setdiscovery.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/similar.py
@@ -332,6 +342,7 @@ file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/filelog.t
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/filerevision.tmpl
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/footer.tmpl
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/graph.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/graphentry.tmpl
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/header.tmpl
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/help.tmpl
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/helptopics.tmpl
@@ -344,6 +355,7 @@ file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/shortlog.
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/summary.tmpl
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/tags.tmpl
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/json/changelist.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/json/graph.tmpl
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/json/map
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/map-cmdline.bisect
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/map-cmdline.changelog
@@ -366,6 +378,7 @@ file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/filelog
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/filerevision.tmpl
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/footer.tmpl
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/graph.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/graphentry.tmpl
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/header.tmpl
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/help.tmpl
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/helptopics.tmpl
@@ -390,6 +403,7 @@ file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/filelogent
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/filerevision.tmpl
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/footer.tmpl
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/graph.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/graphentry.tmpl
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/header.tmpl
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/help.tmpl
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/helptopics.tmpl
@@ -440,6 +454,7 @@ file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/fileloge
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/filerevision.tmpl
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/footer.tmpl
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/graph.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/graphentry.tmpl
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/header.tmpl
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/index.tmpl
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/manifest.tmpl
@@ -452,7 +467,6 @@ file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/tags.tmp
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/background.png
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/coal-file.png
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/coal-folder.png
-file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/excanvas.js
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/feed-icon-14x14.png
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/followlines.js
 file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/hgicon.png
@@ -473,6 +487,7 @@ file path=usr/lib/python2.7/vendor-packages/mercurial/thirdparty/attr/converters
 file path=usr/lib/python2.7/vendor-packages/mercurial/thirdparty/attr/exceptions.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/thirdparty/attr/filters.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/thirdparty/attr/validators.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/thirdparty/selectors2.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/transaction.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/treediscovery.py
 file path=usr/lib/python2.7/vendor-packages/mercurial/txnutil.py
diff --git a/components/developer/mercurial/mercurial-PYVER.p5m b/components/developer/mercurial/mercurial-PYVER.p5m
index 6fff18613..89776c431 100644
--- a/components/developer/mercurial/mercurial-PYVER.p5m
+++ b/components/developer/mercurial/mercurial-PYVER.p5m
@@ -84,6 +84,7 @@ file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/pywatchman/load
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/pywatchman/pybser.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/state.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/watchmanclient.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/githelp.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/gpg.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/graphlog.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/hgk.py
@@ -104,6 +105,10 @@ file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/reposetup.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/storefactory.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/uisetup.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/largefiles/wirestore.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/lfs/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/lfs/blobstore.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/lfs/pointer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/lfs/wrapper.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/logtoprocess.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/mq.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/notify.py
@@ -119,6 +124,7 @@ file path=usr/lib/python$(PYVER)/vendor-packages/hgext/share.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/shelve.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/show.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/sparse.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/split.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/strip.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/transplant.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/uncommit.py
@@ -139,6 +145,7 @@ file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/branchmap.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/bundle2.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/bundlerepo.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/byterange.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/cacheutil.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/cext/64/base85.so
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/cext/64/bdiff.so
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/cext/64/diffhelpers.so
@@ -203,6 +210,7 @@ file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/diffs.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/environment.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/extensions.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/filesets.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/flags.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/glossary.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/hg-ssh.8.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/hg.1.txt
@@ -258,6 +266,7 @@ file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/zh_CN/LC_MESSA
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/zh_TW/LC_MESSAGES/hg.mo
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/localrepo.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/lock.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/logexchange.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/lsprof.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/lsprofcalltree.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/mail.py
@@ -266,6 +275,7 @@ file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/match.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/mdiff.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/merge.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/mergeutil.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/minifileset.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/minirst.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/namespaces.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/node.py
@@ -299,10 +309,10 @@ file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/repoview.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/revlog.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/revset.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/revsetlang.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/rewriteutil.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/scmposix.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/scmutil.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/scmwindows.py
-file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/selectors2.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/server.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/setdiscovery.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/similar.py
@@ -351,6 +361,7 @@ file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/file
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/filerevision.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/footer.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/graph.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/graphentry.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/header.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/help.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/helptopics.tmpl
@@ -363,6 +374,7 @@ file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/shor
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/summary.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/gitweb/tags.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/json/changelist.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/json/graph.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/json/map
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/map-cmdline.bisect
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/map-cmdline.changelog
@@ -385,6 +397,7 @@ file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/fi
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/filerevision.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/footer.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/graph.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/graphentry.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/header.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/help.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/helptopics.tmpl
@@ -409,6 +422,7 @@ file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/filel
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/filerevision.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/footer.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/graph.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/graphentry.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/header.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/help.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/paper/helptopics.tmpl
@@ -459,6 +473,7 @@ file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/fil
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/filerevision.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/footer.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/graph.tmpl
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/graphentry.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/header.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/index.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/manifest.tmpl
@@ -471,7 +486,6 @@ file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/spartan/tag
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/background.png
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/coal-file.png
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/coal-folder.png
-file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/excanvas.js
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/feed-icon-14x14.png
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/followlines.js
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/hgicon.png
@@ -492,6 +506,7 @@ file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/thirdparty/attr/conve
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/thirdparty/attr/exceptions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/thirdparty/attr/filters.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/thirdparty/attr/validators.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/thirdparty/selectors2.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/transaction.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/treediscovery.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/txnutil.py
diff --git a/components/developer/mercurial/patches/manpages.patch b/components/developer/mercurial/patches/manpages.patch
index 92fede459..0ba817443 100644
--- a/components/developer/mercurial/patches/manpages.patch
+++ b/components/developer/mercurial/patches/manpages.patch
@@ -1,5 +1,5 @@
---- mercurial-4.4.1/doc/hg.1.orig	Tue Nov  7 21:15:40 2017
-+++ mercurial-4.4.1/doc/hg.1	Fri Nov 10 17:56:02 2017
+--- mercurial-4.5.2/doc/hg.1.orig	Tue Mar  6 22:20:01 2018
++++ mercurial-4.5.2/doc/hg.1	Wed Mar  7 11:24:47 2018
 @@ -3,33 +3,6 @@
  .TH HG 1 "" "" "Mercurial Manual"
  .SH NAME
@@ -827,14 +827,16 @@
  .TP
  .B \-f,  \-\-force
  .
-@@ -1004,27 +977,27 @@
- .B \-C,  \-\-clean
+@@ -1008,7 +981,7 @@
+ .BI \-r,  \-\-rev \ <VALUE[+]>
  .
- reset branch name to parent branch name
+ change branches of the given revs (EXPERIMENTAL)
 -.UNINDENT
 +.RE
- .SS branches
  .sp
+ [+] marked option can be specified multiple times
+ .SS branches
+@@ -1016,21 +989,21 @@
  list repository named branches:
  .sp
  .nf
@@ -862,7 +864,7 @@
  .TP
  .B \-a,  \-\-active
  .
-@@ -1037,15 +1010,15 @@
+@@ -1043,15 +1016,15 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template (EXPERIMENTAL)
@@ -881,7 +883,7 @@
  .fi
  .sp
  Generate a bundle file containing data to be added to a repository.
-@@ -1057,7 +1030,7 @@
+@@ -1063,7 +1036,7 @@
  default\-push/default if no destination is specified.
  .sp
  You can change bundle format with the \-t/\-\-type option. See
@@ -890,7 +892,7 @@
  the most appropriate format is used and compression defaults to
  bzip2.
  .sp
-@@ -1072,7 +1045,7 @@
+@@ -1078,7 +1051,7 @@
  Returns 0 on success, 1 if no changes found.
  .sp
  Options:
@@ -899,7 +901,7 @@
  .TP
  .B \-f,  \-\-force
  .
-@@ -1109,7 +1082,7 @@
+@@ -1115,7 +1088,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -908,7 +910,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS cat
-@@ -1117,9 +1090,9 @@
+@@ -1123,9 +1096,9 @@
  output the current or given revision of files:
  .sp
  .nf
@@ -920,7 +922,7 @@
  .fi
  .sp
  Print the specified files as they were at the given revision. If
-@@ -1127,7 +1100,7 @@
+@@ -1133,7 +1106,7 @@
  .sp
  Output may be to a file, in which case the name of the file is
  given using a format string. The formatting rules as follows:
@@ -929,7 +931,7 @@
  .TP
  .B \fB%%\fP
  .sp
-@@ -1139,7 +1112,7 @@
+@@ -1145,7 +1118,7 @@
  .TP
  .B \fB%d\fP
  .sp
@@ -938,7 +940,7 @@
  .TP
  .B \fB%p\fP
  .sp
-@@ -1164,12 +1137,12 @@
+@@ -1170,12 +1143,12 @@
  .B \fB%b\fP
  .sp
  basename of the exporting repository
@@ -953,7 +955,7 @@
  .TP
  .BI \-o,  \-\-output \ <FORMAT>
  .
-@@ -1194,7 +1167,7 @@
+@@ -1200,7 +1173,7 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template (EXPERIMENTAL)
@@ -962,7 +964,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS clone
-@@ -1202,9 +1175,9 @@
+@@ -1208,9 +1181,9 @@
  make a copy of an existing repository:
  .sp
  .nf
@@ -974,7 +976,7 @@
  .fi
  .sp
  Create a copy of an existing repository in a new directory.
-@@ -1212,14 +1185,14 @@
+@@ -1218,14 +1191,14 @@
  If no destination directory name is specified, it defaults to the
  basename of the source.
  .sp
@@ -993,7 +995,7 @@
  revision will be checked out in the new repository by default.
  .sp
  To check out a particular version, use \-u/\-\-update, or
-@@ -1228,7 +1201,7 @@
+@@ -1234,7 +1207,7 @@
  To pull only a subset of changesets, specify one or more revisions
  identifiers with \-r/\-\-rev or branches with \-b/\-\-branch. The
  resulting clone will contain only the specified changesets and
@@ -1002,7 +1004,7 @@
  \-\-pull, even for local source repositories.
  .sp
  In normal clone mode, the remote normalizes repository data into a common
-@@ -1258,7 +1231,7 @@
+@@ -1264,7 +1237,7 @@
  .sp
  Mercurial will update the working directory to the first applicable
  revision from this list:
@@ -1011,7 +1013,7 @@
  .IP a. 3
  .
  null if \-U or the source repository has no changesets
-@@ -1265,7 +1238,7 @@
+@@ -1271,7 +1244,7 @@
  .IP b. 3
  .
  if \-u . and the source repository is local, the first parent of
@@ -1020,7 +1022,7 @@
  .IP c. 3
  .
  the changeset specified with \-u (if a branch name, this means the
-@@ -1281,7 +1254,7 @@
+@@ -1287,7 +1260,7 @@
  the tipmost head specified with the url#branch source syntax
  .IP g. 3
  .
@@ -1029,7 +1031,7 @@
  .IP h. 3
  .
  the tipmost head of the default branch
-@@ -1288,7 +1261,7 @@
+@@ -1294,7 +1267,7 @@
  .IP i. 3
  .
  tip
@@ -1038,7 +1040,7 @@
  .sp
  When cloning from servers that support it, Mercurial may fetch
  pre\-generated data from a server\-advertised URL. When this is done,
-@@ -1296,18 +1269,18 @@
+@@ -1302,18 +1275,18 @@
  once for the bundle fetched from the URL and another for any additional
  data not fetched from this URL. In addition, if an error occurs, the
  repository may be rolled back to a partial clone. This behavior may
@@ -1061,7 +1063,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1314,9 +1287,9 @@
+@@ -1320,9 +1293,9 @@
  create a lightweight local clone:
  .sp
  .nf
@@ -1073,7 +1075,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1323,9 +1296,9 @@
+@@ -1329,9 +1302,9 @@
  clone from an absolute path on an ssh server (note double\-slash):
  .sp
  .nf
@@ -1085,7 +1087,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1332,9 +1305,9 @@
+@@ -1338,9 +1311,9 @@
  do a streaming clone while checking out a specified version:
  .sp
  .nf
@@ -1097,7 +1099,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1341,9 +1314,9 @@
+@@ -1347,9 +1320,9 @@
  create a repository without changesets after a particular revision:
  .sp
  .nf
@@ -1109,7 +1111,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1350,18 +1323,18 @@
+@@ -1356,18 +1329,18 @@
  clone (and track) a particular named branch:
  .sp
  .nf
@@ -1133,7 +1135,7 @@
  .TP
  .B \-U,  \-\-noupdate
  .
-@@ -1402,7 +1375,7 @@
+@@ -1408,7 +1381,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -1142,7 +1144,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS commit
-@@ -1410,16 +1383,16 @@
+@@ -1416,16 +1389,16 @@
  commit the specified files or all outstanding changes:
  .sp
  .nf
@@ -1163,7 +1165,7 @@
  will be committed.
  .sp
  If you are committing the result of a merge, do not provide any
-@@ -1428,7 +1401,7 @@
+@@ -1434,7 +1407,7 @@
  If no commit message is specified, Mercurial starts your
  configured editor where you can enter a message. In case your
  commit fails, you will find a backup of your message in
@@ -1172,7 +1174,7 @@
  .sp
  The \-\-close\-branch flag can be used to mark the current branch
  head closed. When all heads of a branch are closed, the branch
-@@ -1436,32 +1409,32 @@
+@@ -1442,32 +1415,32 @@
  .sp
  The \-\-amend flag can be used to amend the parent of the
  working directory with a new commit that contains the changes
@@ -1213,7 +1215,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1468,9 +1441,9 @@
+@@ -1474,9 +1447,9 @@
  commit all non\-binary files:
  .sp
  .nf
@@ -1225,7 +1227,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1477,14 +1450,14 @@
+@@ -1483,14 +1456,14 @@
  amend the current commit and set the date to now:
  .sp
  .nf
@@ -1244,7 +1246,7 @@
  .TP
  .B \-A,  \-\-addremove
  .
-@@ -1537,23 +1510,23 @@
+@@ -1543,23 +1516,23 @@
  .B \-S,  \-\-subrepos
  .
  recurse into subrepositories
@@ -1275,7 +1277,7 @@
  .fi
  .sp
  With no arguments, print names and values of all config items.
-@@ -1571,12 +1544,12 @@
+@@ -1577,12 +1550,12 @@
  With \-\-debug, the source (filename and line number) is printed
  for each config item.
  .sp
@@ -1290,7 +1292,7 @@
  .TP
  .B \-u,  \-\-untrusted
  .
-@@ -1599,15 +1572,15 @@
+@@ -1605,15 +1578,15 @@
  display with template (EXPERIMENTAL)
  .sp
  aliases: showconfig debugconfig
@@ -1309,7 +1311,7 @@
  .fi
  .sp
  Mark dest as having copies of source files. If dest is a
-@@ -1619,12 +1592,12 @@
+@@ -1625,12 +1598,12 @@
  operation is recorded, but no copying is performed.
  .sp
  This command takes effect with the next commit. To undo a copy
@@ -1324,7 +1326,7 @@
  .TP
  .B \-A,  \-\-after
  .
-@@ -1645,23 +1618,23 @@
+@@ -1651,23 +1624,23 @@
  .B \-n,  \-\-dry\-run
  .
  do not perform actions, just print output
@@ -1355,7 +1357,7 @@
  .fi
  .sp
  Show differences between revisions for the specified files.
-@@ -1669,8 +1642,8 @@
+@@ -1675,8 +1648,8 @@
  Differences between files are shown using the unified diff format.
  .IP Note
  .
@@ -1366,7 +1368,7 @@
  parent changeset if no revisions are specified.
  .RE
  .sp
-@@ -1688,18 +1661,18 @@
+@@ -1694,18 +1667,18 @@
  anyway, probably with undesirable results.
  .sp
  Use the \-g/\-\-git option to generate diffs in the git extended diff
@@ -1389,7 +1391,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1706,9 +1679,9 @@
+@@ -1712,9 +1685,9 @@
  compare two historical versions of a directory, with rename info:
  .sp
  .nf
@@ -1401,7 +1403,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1715,9 +1688,9 @@
+@@ -1721,9 +1694,9 @@
  get change stats relative to the last change on some date:
  .sp
  .nf
@@ -1414,7 +1416,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1724,9 +1697,9 @@
+@@ -1730,9 +1703,9 @@
  diff all newly\-added files that contain a keyword:
  .sp
  .nf
@@ -1426,7 +1428,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1733,18 +1706,18 @@
+@@ -1739,18 +1712,18 @@
  compare a revision and its parents:
  .sp
  .nf
@@ -1449,7 +1451,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV[+]>
  .
-@@ -1821,7 +1794,7 @@
+@@ -1827,7 +1800,7 @@
  .B \-S,  \-\-subrepos
  .
  recurse into subrepositories
@@ -1458,7 +1460,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS export
-@@ -1829,9 +1802,9 @@
+@@ -1835,9 +1808,9 @@
  dump the header and diffs for one or more changesets:
  .sp
  .nf
@@ -1470,7 +1472,7 @@
  .fi
  .sp
  Print the changeset header and diffs for one or more revisions.
-@@ -1842,7 +1815,7 @@
+@@ -1848,7 +1821,7 @@
  comment.
  .IP Note
  .
@@ -1479,7 +1481,7 @@
  changesets, as it will compare the merge changeset against its
  first parent only.
  .RE
-@@ -1849,7 +1822,7 @@
+@@ -1855,7 +1828,7 @@
  .sp
  Output may be to a file, in which case the name of the file is
  given using a format string. The formatting rules are as follows:
@@ -1488,7 +1490,7 @@
  .TP
  .B \fB%%\fP
  .sp
-@@ -1886,7 +1859,7 @@
+@@ -1892,7 +1865,7 @@
  .B \fB%r\fP
  .sp
  zero\-padded changeset revision number
@@ -1497,7 +1499,7 @@
  .sp
  Without the \-a/\-\-text option, export will avoid generating diffs
  of files it detects as binary. With \-a, export will generate a
-@@ -1893,13 +1866,13 @@
+@@ -1899,13 +1872,13 @@
  diff anyway, probably with undesirable results.
  .sp
  Use the \-g/\-\-git option to generate diffs in the git extended diff
@@ -1513,7 +1515,7 @@
  .IP \(bu 2
  .
  use export and import to transplant a bugfix to the current
-@@ -1906,9 +1879,9 @@
+@@ -1912,9 +1885,9 @@
  branch:
  .sp
  .nf
@@ -1525,7 +1527,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1916,9 +1889,9 @@
+@@ -1922,9 +1895,9 @@
  rename information:
  .sp
  .nf
@@ -1537,7 +1539,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1926,16 +1899,16 @@
+@@ -1932,16 +1905,16 @@
  descriptive names:
  .sp
  .nf
@@ -1558,7 +1560,7 @@
  .TP
  .BI \-o,  \-\-output \ <FORMAT>
  .
-@@ -1964,7 +1937,7 @@
+@@ -1970,7 +1943,7 @@
  .B \-\-nodates
  .
  omit dates from diff headers
@@ -1567,7 +1569,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS files
-@@ -1972,9 +1945,9 @@
+@@ -1978,9 +1951,9 @@
  list tracked files:
  .sp
  .nf
@@ -1579,7 +1581,7 @@
  .fi
  .sp
  Print files under Mercurial control in the working directory or
-@@ -1985,15 +1958,15 @@
+@@ -1991,15 +1964,15 @@
  of all files under Mercurial control.
  .sp
  Examples:
@@ -1598,7 +1600,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2000,9 +1973,9 @@
+@@ -2006,9 +1979,9 @@
  shows sizes and flags for current revision:
  .sp
  .nf
@@ -1610,7 +1612,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2009,9 +1982,9 @@
+@@ -2015,9 +1988,9 @@
  list all files named README:
  .sp
  .nf
@@ -1622,7 +1624,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2018,9 +1991,9 @@
+@@ -2024,9 +1997,9 @@
  list all binary files:
  .sp
  .nf
@@ -1634,7 +1636,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2027,9 +2000,9 @@
+@@ -2033,9 +2006,9 @@
  find files containing a regular expression:
  .sp
  .nf
@@ -1647,7 +1649,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2036,19 +2009,19 @@
+@@ -2042,19 +2015,19 @@
  search tracked file contents with xargs and grep:
  .sp
  .nf
@@ -1672,7 +1674,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
-@@ -2073,7 +2046,7 @@
+@@ -2079,7 +2052,7 @@
  .B \-S,  \-\-subrepos
  .
  recurse into subrepositories
@@ -1681,7 +1683,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS forget
-@@ -2081,9 +2054,9 @@
+@@ -2087,9 +2060,9 @@
  forget the specified files on the next commit:
  .sp
  .nf
@@ -1693,7 +1695,7 @@
  .fi
  .sp
  Mark the specified files so they will no longer be tracked
-@@ -2093,20 +2066,20 @@
+@@ -2099,20 +2072,20 @@
  entire project history, and it does not delete them from the
  working directory.
  .sp
@@ -1719,7 +1721,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2113,16 +2086,16 @@
+@@ -2119,16 +2092,16 @@
  forget files that would be excluded by .hgignore:
  .sp
  .nf
@@ -1740,7 +1742,7 @@
  .TP
  .BI \-I,  \-\-include \ <PATTERN[+]>
  .
-@@ -2131,7 +2104,7 @@
+@@ -2137,7 +2110,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -1749,7 +1751,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS graft
-@@ -2139,15 +2112,15 @@
+@@ -2145,15 +2118,15 @@
  copy changes from other branches onto the current branch:
  .sp
  .nf
@@ -1770,7 +1772,7 @@
  description from the source changesets.
  .sp
  Changesets that are ancestors of the current revision, that have
-@@ -2157,9 +2130,9 @@
+@@ -2163,9 +2136,9 @@
  of the form:
  .sp
  .nf
@@ -1782,7 +1784,7 @@
  .fi
  .sp
  If \-\-force is specified, revisions will be grafted even if they
-@@ -2177,16 +2150,16 @@
+@@ -2183,16 +2156,16 @@
  .RE
  .sp
  Examples:
@@ -1802,7 +1804,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2193,9 +2166,9 @@
+@@ -2199,9 +2172,9 @@
  graft a range of changesets with one exception, updating dates:
  .sp
  .nf
@@ -1814,7 +1816,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2202,9 +2175,9 @@
+@@ -2208,9 +2181,9 @@
  continue a graft after resolving conflicts:
  .sp
  .nf
@@ -1826,7 +1828,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2211,9 +2184,9 @@
+@@ -2217,9 +2190,9 @@
  show the source of a grafted changeset:
  .sp
  .nf
@@ -1838,7 +1840,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2220,18 +2193,18 @@
+@@ -2226,18 +2199,18 @@
  show revisions sorted by date:
  .sp
  .nf
@@ -1862,7 +1864,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV[+]>
  .
-@@ -2276,7 +2249,7 @@
+@@ -2282,7 +2255,7 @@
  .B \-n,  \-\-dry\-run
  .
  do not perform actions, just print output
@@ -1871,7 +1873,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS grep
-@@ -2284,9 +2257,9 @@
+@@ -2290,9 +2263,9 @@
  search revision history for a pattern in specified files:
  .sp
  .nf
@@ -1883,7 +1885,7 @@
  .fi
  .sp
  Search revision history for a regular expression in the specified
-@@ -2301,14 +2274,14 @@
+@@ -2307,14 +2280,14 @@
  PATTERN can be any Python (roughly Perl\-compatible) regular
  expression.
  .sp
@@ -1901,7 +1903,7 @@
  .TP
  .B \-0,  \-\-print0
  .
-@@ -2361,7 +2334,7 @@
+@@ -2367,7 +2340,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -1910,7 +1912,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS heads
-@@ -2369,9 +2342,9 @@
+@@ -2375,9 +2348,9 @@
  show branch heads:
  .sp
  .nf
@@ -1922,7 +1924,7 @@
  .fi
  .sp
  With no arguments, show all open branch heads in the repository.
-@@ -2381,11 +2354,11 @@
+@@ -2387,11 +2360,11 @@
  .sp
  If one or more REVs are given, only open branch heads on the
  branches associated with the specified changesets are shown. This
@@ -1936,7 +1938,7 @@
  .sp
  If STARTREV is specified, only those heads that are descendants of
  STARTREV will be displayed.
-@@ -2396,7 +2369,7 @@
+@@ -2402,7 +2375,7 @@
  Returns 0 if matching heads are found, 1 if not.
  .sp
  Options:
@@ -1945,7 +1947,7 @@
  .TP
  .BI \-r,  \-\-rev \ <STARTREV>
  .
-@@ -2421,15 +2394,15 @@
+@@ -2427,15 +2400,15 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template
@@ -1964,7 +1966,7 @@
  .fi
  .sp
  With no arguments, print a list of commands with short help messages.
-@@ -2440,7 +2413,7 @@
+@@ -2446,7 +2419,7 @@
  Returns 0 if successful.
  .sp
  Options:
@@ -1973,7 +1975,7 @@
  .TP
  .B \-e,  \-\-extension
  .
-@@ -2457,7 +2430,7 @@
+@@ -2463,7 +2436,7 @@
  .BI \-s,  \-\-system \ <VALUE[+]>
  .
  show help for specific platform(s)
@@ -1982,7 +1984,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS identify
-@@ -2465,9 +2438,9 @@
+@@ -2471,9 +2444,9 @@
  identify the working directory or specified revision:
  .sp
  .nf
@@ -1994,7 +1996,7 @@
  .fi
  .sp
  Print a summary identifying the repository state at REV using one or
-@@ -2482,15 +2455,15 @@
+@@ -2489,15 +2462,15 @@
  cause lookup to operate on that repository/bundle.
  .sp
  Examples:
@@ -2013,7 +2015,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2497,9 +2470,9 @@
+@@ -2504,9 +2477,9 @@
  find the revision corresponding to a tag:
  .sp
  .nf
@@ -2025,7 +2027,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2506,19 +2479,19 @@
+@@ -2513,19 +2486,19 @@
  check the most recent revision of a remote repository:
  .sp
  .nf
@@ -2050,7 +2052,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
-@@ -2561,15 +2534,15 @@
+@@ -2568,15 +2541,15 @@
  display with template (EXPERIMENTAL)
  .sp
  aliases: id
@@ -2069,7 +2071,7 @@
  .fi
  .sp
  Import a list of patches and commit them individually (unless
-@@ -2595,7 +2568,7 @@
+@@ -2602,7 +2575,7 @@
  text/plain body parts before first diff are added to the commit
  message.
  .sp
@@ -2078,7 +2080,7 @@
  description from patch override values from message headers and
  body. Values given on command line with \-m/\-\-message and \-u/\-\-user
  override these.
-@@ -2605,42 +2578,42 @@
+@@ -2612,42 +2585,42 @@
  resulting changeset has a different ID than the one recorded in
  the patch. This will guard against various ways that portable
  patch formats and mail systems might fail to transfer Mercurial
@@ -2130,7 +2132,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2647,9 +2620,9 @@
+@@ -2654,9 +2627,9 @@
  import a changeset from an hgweb server:
  .sp
  .nf
@@ -2142,7 +2144,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2656,9 +2629,9 @@
+@@ -2663,9 +2636,9 @@
  import all the patches in an Unix\-style mbox:
  .sp
  .nf
@@ -2154,7 +2156,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2665,9 +2638,9 @@
+@@ -2672,9 +2645,9 @@
  import patches from stdin:
  .sp
  .nf
@@ -2166,7 +2168,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2675,35 +2648,35 @@
+@@ -2682,35 +2655,35 @@
  possible):
  .sp
  .nf
@@ -2214,7 +2216,7 @@
  .TP
  .BI \-p,  \-\-strip \ <NUM>
  .
-@@ -2723,7 +2696,7 @@
+@@ -2730,7 +2703,7 @@
  .TP
  .B \-\-no\-commit
  .
@@ -2223,7 +2225,7 @@
  .TP
  .B \-\-bypass
  .
-@@ -2766,20 +2739,20 @@
+@@ -2773,20 +2746,20 @@
  guess renamed files by similarity (0<=s<=100)
  .sp
  aliases: patch
@@ -2248,7 +2250,7 @@
  .sp
  See pull for valid source format details.
  .sp
-@@ -2788,17 +2761,17 @@
+@@ -2795,17 +2768,17 @@
  status is also displayed for each bookmark like below:
  .sp
  .nf
@@ -2269,7 +2271,7 @@
  .TP
  .B \fBadded\fP
  .sp
-@@ -2815,7 +2788,7 @@
+@@ -2822,7 +2795,7 @@
  .B \fBchanged\fP
  .sp
  result depends on remote changesets
@@ -2278,7 +2280,7 @@
  .sp
  From the point of view of pulling behavior, bookmark
  existing only in the remote repository are treated as \fBadded\fP,
-@@ -2825,15 +2798,15 @@
+@@ -2832,15 +2805,15 @@
  changesets twice if the incoming is followed by a pull.
  .sp
  Examples:
@@ -2297,7 +2299,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2840,10 +2813,10 @@
+@@ -2847,10 +2820,10 @@
  show incoming changes excluding merges, store a bundle:
  .sp
  .nf
@@ -2310,7 +2312,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2850,16 +2823,16 @@
+@@ -2857,16 +2830,16 @@
  briefly list changes inside a bundle:
  .sp
  .nf
@@ -2331,7 +2333,7 @@
  .TP
  .B \-f,  \-\-force
  .
-@@ -2932,23 +2905,23 @@
+@@ -2939,23 +2912,23 @@
  .B \-S,  \-\-subrepos
  .
  recurse into subrepositories
@@ -2362,7 +2364,7 @@
  .fi
  .sp
  Initialize a new repository in the given directory. If the given
-@@ -2957,12 +2930,12 @@
+@@ -2964,12 +2937,12 @@
  If no directory is given, the current directory is used.
  .sp
  It is possible to specify an \fBssh://\fP URL as the destination.
@@ -2377,7 +2379,7 @@
  .TP
  .BI \-e,  \-\-ssh \ <CMD>
  .
-@@ -2975,15 +2948,15 @@
+@@ -2982,15 +2955,15 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -2396,7 +2398,7 @@
  .fi
  .sp
  Print files under Mercurial control in the working directory whose
-@@ -3001,12 +2974,12 @@
+@@ -3008,12 +2981,12 @@
  will avoid the problem of "xargs" treating single filenames that
  contain whitespace as multiple filenames.
  .sp
@@ -2411,7 +2413,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
-@@ -3027,7 +3000,7 @@
+@@ -3034,7 +3007,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -2420,7 +2422,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS log
-@@ -3035,9 +3008,9 @@
+@@ -3042,9 +3015,9 @@
  show revision history of entire repository or files:
  .sp
  .nf
@@ -2432,24 +2434,25 @@
  .fi
  .sp
  Print the revision history of the specified files or the entire
-@@ -3059,11 +3032,11 @@
+@@ -3066,12 +3039,12 @@
  .sp
  With \-\-graph the revisions are shown as an ASCII art DAG with the most
  recent changeset at the top.
--\(aqo\(aq is a changeset, \(aq@\(aq is a working directory parent, \(aqx\(aq is obsolete,
--and \(aq+\(aq represents a fork where the changeset from the lines below is a
--parent of the \(aqo\(aq merge on the same line.
+-\(aqo\(aq is a changeset, \(aq@\(aq is a working directory parent, \(aq_\(aq closes a branch,
+-\(aqx\(aq is obsolete, \(aq*\(aq is unstable, and \(aq+\(aq represents a fork where the
+-changeset from the lines below is a parent of the \(aqo\(aq merge on the same
++\&'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
++\&'x' is obsolete, '*' is unstable, and '+' represents a fork where the
++changeset from the lines below is a parent of the 'o' merge on the same
+ line.
 -Paths in the DAG are represented with \(aq|\(aq, \(aq/\(aq and so forth. \(aq:\(aq in place
 -of a \(aq|\(aq indicates one or more revisions in a path are omitted.
-+\&'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
-+and '+' represents a fork where the changeset from the lines below is a
-+parent of the 'o' merge on the same line.
 +Paths in the DAG are represented with '|', '/' and so forth. ':' in place
 +of a '|' indicates one or more revisions in a path are omitted.
  .sp
  Use \-L/\-\-line\-range FILE,M:N options to follow the history of lines
  from M to N in FILE. With \-p/\-\-patch only diff hunks affecting
-@@ -3072,7 +3045,7 @@
+@@ -3080,7 +3053,7 @@
  compatible with \-\-graph. This option is experimental.
  .IP Note
  .
@@ -2458,7 +2461,7 @@
  changesets, as it will only compare the merge changeset against
  its first parent. Also, only files different from BOTH parents
  will appear in files:.
-@@ -3079,7 +3052,7 @@
+@@ -3087,7 +3060,7 @@
  .RE
  .IP Note
  .
@@ -2467,7 +2470,7 @@
  made on branches and will not show removals or mode changes. To
  see all such changes, use the \-\-removed switch.
  .RE
-@@ -3091,15 +3064,15 @@
+@@ -3099,15 +3072,15 @@
  .RE
  .sp
  Some examples:
@@ -2486,7 +2489,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -3106,9 +3079,9 @@
+@@ -3114,9 +3087,9 @@
  changesets ancestral to the working directory:
  .sp
  .nf
@@ -2498,7 +2501,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -3115,9 +3088,9 @@
+@@ -3123,9 +3096,9 @@
  last 10 commits on the current branch:
  .sp
  .nf
@@ -2510,7 +2513,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -3124,9 +3097,9 @@
+@@ -3132,9 +3105,9 @@
  changesets showing all modifications of a file, including removals:
  .sp
  .nf
@@ -2522,7 +2525,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -3133,9 +3106,9 @@
+@@ -3141,9 +3114,9 @@
  all changesets that touch a directory, with diffs, excluding merges:
  .sp
  .nf
@@ -2534,7 +2537,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -3142,9 +3115,9 @@
+@@ -3150,9 +3123,9 @@
  all revision numbers that match a keyword:
  .sp
  .nf
@@ -2546,7 +2549,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -3151,9 +3124,9 @@
+@@ -3159,9 +3132,9 @@
  the full hash identifier of the working directory parent:
  .sp
  .nf
@@ -2558,7 +2561,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -3160,9 +3133,9 @@
+@@ -3168,9 +3141,9 @@
  list available log templates:
  .sp
  .nf
@@ -2570,7 +2573,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -3169,9 +3142,9 @@
+@@ -3177,9 +3150,9 @@
  check if a given changeset is included in a tagged release:
  .sp
  .nf
@@ -2582,7 +2585,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -3178,9 +3151,9 @@
+@@ -3186,9 +3159,9 @@
  find all changesets by some user in a date range:
  .sp
  .nf
@@ -2594,7 +2597,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -3187,9 +3160,9 @@
+@@ -3195,9 +3168,9 @@
  summary of all changesets after the last tag:
  .sp
  .nf
@@ -2606,7 +2609,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -3196,9 +3169,9 @@
+@@ -3204,9 +3177,9 @@
  changesets touching lines 13 to 23 for file.c:
  .sp
  .nf
@@ -2618,7 +2621,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -3206,18 +3179,18 @@
+@@ -3214,18 +3187,18 @@
  main.c with patch:
  .sp
  .nf
@@ -2643,7 +2646,7 @@
  specifying custom templates. The default template used by the log
  command can be customized via the \fBui.logtemplate\fP configuration
  setting.
-@@ -3225,7 +3198,7 @@
+@@ -3233,7 +3206,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -2652,7 +2655,7 @@
  .TP
  .B \-f,  \-\-follow
  .
-@@ -3318,23 +3291,23 @@
+@@ -3326,23 +3299,23 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -2683,7 +2686,7 @@
  .fi
  .sp
  Print a list of version controlled files for the given revision.
-@@ -3350,7 +3323,7 @@
+@@ -3358,7 +3331,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -2692,7 +2695,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
-@@ -3363,15 +3336,15 @@
+@@ -3371,15 +3344,15 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template (EXPERIMENTAL)
@@ -2711,7 +2714,7 @@
  .fi
  .sp
  The current working directory is updated with all changes made in
-@@ -3384,16 +3357,16 @@
+@@ -3392,16 +3365,16 @@
  .sp
  \fB\-\-tool\fP can be used to specify the merge tool used for file
  merges. It overrides the HGMERGE environment variable and your
@@ -2727,12 +2730,12 @@
 -See \%\fBhg help resolve\fP\: for information on handling file conflicts.
 +See \fBhg help resolve\fP for information on handling file conflicts.
  .sp
--To undo an uncommitted merge, use \%\fBhg update \-\-clean .\fP\: which
-+To undo an uncommitted merge, use \fBhg update \-\-clean .\fP which
+-To undo an uncommitted merge, use \%\fBhg merge \-\-abort\fP\: which
++To undo an uncommitted merge, use \fBhg merge \-\-abort\fP which
  will check out a clean copy of the original merge parent, losing
  all changes.
  .sp
-@@ -3400,7 +3373,7 @@
+@@ -3408,7 +3381,7 @@
  Returns 0 on success, 1 if there are unresolved files.
  .sp
  Options:
@@ -2741,7 +2744,7 @@
  .TP
  .B \-f,  \-\-force
  .
-@@ -3417,15 +3390,15 @@
+@@ -3429,15 +3402,15 @@
  .BI \-t,  \-\-tool \ <VALUE>
  .
  specify merge tool
@@ -2760,7 +2763,7 @@
  .fi
  .sp
  Show changesets not found in the specified destination repository
-@@ -3439,18 +3412,18 @@
+@@ -3451,18 +3424,18 @@
  status is also displayed for each bookmark like below:
  .sp
  .nf
@@ -2782,7 +2785,7 @@
  .TP
  .B \fBadded\fP
  .sp
-@@ -3471,7 +3444,7 @@
+@@ -3483,7 +3456,7 @@
  .B \fBchanged\fP
  .sp
  push with \fB\-B\fP will update it
@@ -2791,7 +2794,7 @@
  .sp
  From the point of view of pushing behavior, bookmarks
  existing only in the remote repository are treated as
-@@ -3480,7 +3453,7 @@
+@@ -3492,7 +3465,7 @@
  Returns 0 if there are outgoing changes, 1 otherwise.
  .sp
  Options:
@@ -2800,7 +2803,7 @@
  .TP
  .B \-f,  \-\-force
  .
-@@ -3549,26 +3522,26 @@
+@@ -3561,26 +3534,26 @@
  .B \-S,  \-\-subrepos
  .
  recurse into subrepositories
@@ -2835,7 +2838,7 @@
  given via \-r/\-\-rev, the parent of that revision will be printed.
  If a file argument is given, the revision in which the file was
  last changed (before the working directory revision or the
-@@ -3577,20 +3550,20 @@
+@@ -3589,20 +3562,20 @@
  This command is equivalent to:
  .sp
  .nf
@@ -2860,7 +2863,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
-@@ -3603,15 +3576,15 @@
+@@ -3615,15 +3588,15 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template
@@ -2879,7 +2882,7 @@
  .fi
  .sp
  Show definition of symbolic path name NAME. If no name is given,
-@@ -3634,29 +3607,29 @@
+@@ -3646,29 +3619,29 @@
  .IP Note
  .
  \fBdefault\fP and \fBdefault\-push\fP apply to all inbound (e.g.
@@ -2916,7 +2919,7 @@
  .fi
  .sp
  With no argument, show the phase name of the current revision(s).
-@@ -3664,21 +3637,21 @@
+@@ -3676,21 +3649,21 @@
  With one of \-p/\-\-public, \-d/\-\-draft or \-s/\-\-secret, change the
  phase value of the specified revisions.
  .sp
@@ -2943,7 +2946,7 @@
  .TP
  .B \-p,  \-\-public
  .
-@@ -3699,7 +3672,7 @@
+@@ -3711,7 +3684,7 @@
  .BI \-r,  \-\-rev \ <REV[+]>
  .
  target revision
@@ -2952,7 +2955,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS pull
-@@ -3707,9 +3680,9 @@
+@@ -3719,9 +3692,9 @@
  pull changes from the specified source:
  .sp
  .nf
@@ -2964,7 +2967,7 @@
  .fi
  .sp
  Pull changes from a remote repository to a local one.
-@@ -3719,21 +3692,21 @@
+@@ -3731,21 +3704,21 @@
  \-R is specified). By default, this does not update the copy of the
  project in the working directory.
  .sp
@@ -2993,7 +2996,7 @@
  .TP
  .B \-u,  \-\-update
  .
-@@ -3766,7 +3739,7 @@
+@@ -3778,7 +3751,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -3002,7 +3005,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS push
-@@ -3774,9 +3747,9 @@
+@@ -3786,9 +3759,9 @@
  push changes to the specified destination:
  .sp
  .nf
@@ -3014,7 +3017,7 @@
  .fi
  .sp
  Push changesets from the local repository to the specified
-@@ -3806,9 +3779,9 @@
+@@ -3818,9 +3791,9 @@
  If \-B/\-\-bookmark is used, the specified bookmarked revision, its
  ancestors, and the bookmark will be pushed to the remote
  repository. Specifying \fB.\fP is equivalent to specifying the active
@@ -3026,7 +3029,7 @@
  URLs. If DESTINATION is omitted, a default path will be used.
  .sp
  The \-\-pushvars option sends strings to the server that become
-@@ -3826,16 +3799,16 @@
+@@ -3838,16 +3811,16 @@
  following to your configuration file:
  .sp
  .nf
@@ -3046,7 +3049,7 @@
  .TP
  .B \-f,  \-\-force
  .
-@@ -3872,7 +3845,7 @@
+@@ -3884,7 +3857,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -3055,7 +3058,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS recover
-@@ -3880,9 +3853,9 @@
+@@ -3892,9 +3865,9 @@
  roll back an interrupted transaction:
  .sp
  .nf
@@ -3067,7 +3070,7 @@
  .fi
  .sp
  Recover from an interrupted commit or pull.
-@@ -3897,16 +3870,16 @@
+@@ -3909,16 +3882,16 @@
  remove the specified files on the next commit:
  .sp
  .nf
@@ -3088,7 +3091,7 @@
  .sp
  \-A/\-\-after can be used to remove only files that have already
  been deleted, \-f/\-\-force can be used to force deletion, and \-Af
-@@ -3916,7 +3889,7 @@
+@@ -3928,7 +3901,7 @@
  The following table details the behavior of remove for different
  file states (columns) and option combinations (rows). The file
  states are Added [A], Clean [C], Modified [M] and Missing [!]
@@ -3097,7 +3100,7 @@
  (from branch) and Delete (from disk):
  .TS
  center;
-@@ -3985,7 +3958,7 @@
+@@ -3997,7 +3970,7 @@
  .TE
  .IP Note
  .
@@ -3106,7 +3109,7 @@
  working directory, not even if \fB\-\-force\fP is specified.
  .RE
  .sp
-@@ -3992,7 +3965,7 @@
+@@ -4004,7 +3977,7 @@
  Returns 0 on success, 1 if any warnings encountered.
  .sp
  Options:
@@ -3115,7 +3118,7 @@
  .TP
  .B \-A,  \-\-after
  .
-@@ -4013,23 +3986,23 @@
+@@ -4025,23 +3998,23 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -3146,7 +3149,7 @@
  .fi
  .sp
  Mark dest as copies of sources; mark sources for deletion. If dest
-@@ -4041,12 +4014,12 @@
+@@ -4053,12 +4026,12 @@
  operation is recorded, but no copying is performed.
  .sp
  This command takes effect at the next commit. To undo a rename
@@ -3161,7 +3164,7 @@
  .TP
  .B \-A,  \-\-after
  .
-@@ -4067,23 +4040,23 @@
+@@ -4079,23 +4052,23 @@
  .B \-n,  \-\-dry\-run
  .
  do not perform actions, just print output
@@ -3192,7 +3195,7 @@
  .fi
  .sp
  Merges with unresolved conflicts are often the result of
-@@ -4090,15 +4063,15 @@
+@@ -4102,15 +4075,15 @@
  non\-interactive merging using the \fBinternal:merge\fP configuration
  setting, or a command\-line merge tool like \fBdiff3\fP. The resolve
  command is used to manage the files involved in a merge, after
@@ -3213,7 +3216,7 @@
  files, discarding any previous merge attempts. Re\-merging is not
  performed for files already marked as resolved. Use \fB\-\-all/\-a\fP
  to select all unresolved files. \fB\-\-tool\fP can be used to specify
-@@ -4107,24 +4080,24 @@
+@@ -4119,24 +4092,24 @@
  contents are saved with a \fB.orig\fP suffix.
  .IP \(bu 2
  .
@@ -3244,7 +3247,7 @@
  commit after a conflicting merge.
  .RE
  .sp
-@@ -4131,7 +4104,7 @@
+@@ -4143,7 +4116,7 @@
  Returns 0 on success, 1 if any files fail a resolve attempt.
  .sp
  Options:
@@ -3253,7 +3256,7 @@
  .TP
  .B \-a,  \-\-all
  .
-@@ -4168,7 +4141,7 @@
+@@ -4180,7 +4153,7 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template (EXPERIMENTAL)
@@ -3262,7 +3265,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS revert
-@@ -4176,15 +4149,15 @@
+@@ -4188,15 +4161,15 @@
  restore files to their checkout state:
  .sp
  .nf
@@ -3277,12 +3280,12 @@
 -To check out earlier revisions, you should use \%\fBhg update REV\fP\:.
 +To check out earlier revisions, you should use \fBhg update REV\fP.
  To cancel an uncommitted merge (and lose your changes),
--use \%\fBhg update \-\-clean .\fP\:.
-+use \fBhg update \-\-clean .\fP.
+-use \%\fBhg merge \-\-abort\fP\:.
++use \fBhg merge \-\-abort\fP.
  .RE
  .sp
  With no revision specified, revert the specified files or directories
-@@ -4198,7 +4171,7 @@
+@@ -4210,7 +4183,7 @@
  directories to their states as of a specific revision. Because
  revert does not change the working directory parents, this will
  cause these files to appear modified. This can be helpful to "back
@@ -3291,7 +3294,7 @@
  related method.
  .sp
  Modified files are saved with a .orig suffix before reverting.
-@@ -4207,15 +4180,15 @@
+@@ -4219,15 +4192,15 @@
  repository by setting the \fBui.origbackuppath\fP configuration
  option.
  .sp
@@ -3310,7 +3313,7 @@
  .TP
  .B \-a,  \-\-all
  .
-@@ -4248,7 +4221,7 @@
+@@ -4260,7 +4233,7 @@
  .B \-n,  \-\-dry\-run
  .
  do not perform actions, just print output
@@ -3319,7 +3322,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS rollback
-@@ -4256,12 +4229,12 @@
+@@ -4268,12 +4241,12 @@
  roll back the last transaction (DANGEROUS) (DEPRECATED):
  .sp
  .nf
@@ -3335,7 +3338,7 @@
  mistakes in the last commit.
  .sp
  This command should be used with care. There is only one level of
-@@ -4276,7 +4249,7 @@
+@@ -4288,7 +4261,7 @@
  .sp
  For example, the following commands are transactional, and their
  effects can be rolled back:
@@ -3344,7 +3347,7 @@
  .IP \(bu 2
  .
  commit
-@@ -4292,15 +4265,15 @@
+@@ -4304,15 +4277,15 @@
  .IP \(bu 2
  .
  unbundle
@@ -3364,7 +3367,7 @@
  re\-enable the command by setting \fBui.rollback\fP to true.
  .sp
  This command is not intended for use on public repositories. Once
-@@ -4313,7 +4286,7 @@
+@@ -4325,7 +4298,7 @@
  Returns 0 on success, 1 if no rollback data is available.
  .sp
  Options:
@@ -3373,7 +3376,7 @@
  .TP
  .B \-n,  \-\-dry\-run
  .
-@@ -4322,15 +4295,15 @@
+@@ -4334,15 +4307,15 @@
  .B \-f,  \-\-force
  .
  ignore safety measures
@@ -3392,7 +3395,7 @@
  .fi
  .sp
  Print the root directory of the current repository.
-@@ -4341,9 +4314,9 @@
+@@ -4353,9 +4326,9 @@
  start stand\-alone webserver:
  .sp
  .nf
@@ -3404,7 +3407,7 @@
  .fi
  .sp
  Start a local HTTP repository browser and pull server. You can use
-@@ -4368,7 +4341,7 @@
+@@ -4380,7 +4353,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -3413,7 +3416,7 @@
  .TP
  .BI \-A,  \-\-accesslog \ <FILE>
  .
-@@ -4404,7 +4377,7 @@
+@@ -4416,7 +4389,7 @@
  .TP
  .BI \-\-web\-conf \ <FILE>
  .
@@ -3422,7 +3425,7 @@
  .TP
  .BI \-\-webdir\-conf \ <FILE>
  .
-@@ -4441,7 +4414,7 @@
+@@ -4453,7 +4426,7 @@
  .B \-S,  \-\-subrepos
  .
  recurse into subrepositories
@@ -3431,7 +3434,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS status
-@@ -4449,9 +4422,9 @@
+@@ -4461,9 +4434,9 @@
  show changed files in the working directory:
  .sp
  .nf
@@ -3443,7 +3446,7 @@
  .fi
  .sp
  Show status of files in the repository. If names are given, only
-@@ -4465,7 +4438,7 @@
+@@ -4477,7 +4450,7 @@
  unless explicitly requested with \-u/\-\-unknown or \-i/\-\-ignored.
  .IP Note
  .
@@ -3452,7 +3455,7 @@
  changed or a merge has occurred. The standard diff format does
  not report permission changes and diff only reports changes
  relative to one merge parent.
-@@ -4479,7 +4452,7 @@
+@@ -4491,7 +4464,7 @@
  The codes used to show the status of files are:
  .sp
  .nf
@@ -3461,7 +3464,7 @@
  M = modified
  A = added
  R = removed
-@@ -4488,17 +4461,17 @@
+@@ -4500,17 +4473,17 @@
  ? = not tracked
  I = ignored
    = origin of the previous file (with \-\-copies)
@@ -3484,7 +3487,7 @@
  and \-i/\-\-ignored options are also used.
  .sp
  The \-v/\-\-verbose option shows information when the repository is in an
-@@ -4506,11 +4479,11 @@
+@@ -4518,11 +4491,11 @@
  turned on by default by enabling the \fBcommands.status.verbose\fP option.
  .sp
  You can skip displaying some of these states by setting
@@ -3499,7 +3502,7 @@
  .IP \(bu 2
  .
  show changes in the working directory relative to a
-@@ -4517,19 +4490,19 @@
+@@ -4529,19 +4502,19 @@
  changeset:
  .sp
  .nf
@@ -3524,7 +3527,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -4536,9 +4509,9 @@
+@@ -4548,9 +4521,9 @@
  show all changes including copies in an existing changeset:
  .sp
  .nf
@@ -3536,7 +3539,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -4545,9 +4518,9 @@
+@@ -4557,9 +4530,9 @@
  get a NUL separated list of added files, suitable for xargs:
  .sp
  .nf
@@ -3548,7 +3551,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -4555,16 +4528,16 @@
+@@ -4567,16 +4540,16 @@
  added, removed, modified, deleted, and untracked paths:
  .sp
  .nf
@@ -3569,7 +3572,7 @@
  .TP
  .B \-A,  \-\-all
  .
-@@ -4637,23 +4610,23 @@
+@@ -4649,23 +4622,23 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template (EXPERIMENTAL)
@@ -3600,7 +3603,7 @@
  .fi
  .sp
  This generates a brief summary of the working directory state,
-@@ -4665,7 +4638,7 @@
+@@ -4677,7 +4650,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -3609,7 +3612,7 @@
  .TP
  .B \-\-remote
  .
-@@ -4672,15 +4645,15 @@
+@@ -4684,15 +4657,15 @@
  check for push and pull
  .sp
  aliases: sum
@@ -3628,7 +3631,7 @@
  .fi
  .sp
  Name a particular revision using <name>.
-@@ -4701,11 +4674,11 @@
+@@ -4713,11 +4686,11 @@
  repositories).
  .sp
  Tag commits are usually made at the head of a branch. If the parent
@@ -3642,7 +3645,7 @@
  .sp
  Since tag names have priority over branch names during revision
  lookup, using an existing branch name as a tag name is discouraged.
-@@ -4713,7 +4686,7 @@
+@@ -4725,7 +4698,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -3651,7 +3654,7 @@
  .TP
  .B \-f,  \-\-force
  .
-@@ -4746,15 +4719,15 @@
+@@ -4758,15 +4731,15 @@
  .BI \-u,  \-\-user \ <USER>
  .
  record the specified user as committer
@@ -3670,7 +3673,7 @@
  .fi
  .sp
  This lists both regular and local tags. When the \-v/\-\-verbose
-@@ -4764,20 +4737,20 @@
+@@ -4776,20 +4749,20 @@
  Returns 0 on success.
  .sp
  Options:
@@ -3695,7 +3698,7 @@
  .fi
  .sp
  The tip revision (usually just called the tip) is the changeset
-@@ -4789,12 +4762,12 @@
+@@ -4801,12 +4774,12 @@
  that repository becomes the current tip. The "tip" tag is special
  and cannot be renamed or assigned to a different changeset.
  .sp
@@ -3710,7 +3713,7 @@
  .TP
  .B \-p,  \-\-patch
  .
-@@ -4811,48 +4784,48 @@
+@@ -4823,48 +4796,48 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template
@@ -3773,7 +3776,7 @@
  aborted. With the \-c/\-\-check option, the working directory is checked
  for uncommitted changes; if none are found, the working directory is
  updated to the specified changeset.
-@@ -4860,12 +4833,12 @@
+@@ -4872,12 +4845,12 @@
  The \-C/\-\-clean, \-c/\-\-check, and \-m/\-\-merge options control what
  happens if the working directory contains uncommitted changes.
  At most of one of them can be specified.
@@ -3788,7 +3791,7 @@
  are merged into the requested changeset and the merged
  result is left uncommitted. If the requested changeset is
  not an ancestor or descendant (that is, it is on another
-@@ -4875,7 +4848,7 @@
+@@ -4887,7 +4860,7 @@
  .
  With the \-m/\-\-merge option, the update is allowed even if the
  requested changeset is not an ancestor or descendant of
@@ -3797,7 +3800,7 @@
  .IP 3. 3
  .
  With the \-c/\-\-check option, the update is aborted and the
-@@ -4884,23 +4857,23 @@
+@@ -4896,23 +4869,23 @@
  .
  With the \-C/\-\-clean option, uncommitted changes are discarded and
  the working directory is updated to the requested changeset.
@@ -3805,8 +3808,8 @@
 +.RE
  .sp
  To cancel an uncommitted merge (and lose your changes), use
--\%\fBhg update \-\-clean .\fP\:.
-+\fBhg update \-\-clean .\fP.
+-\%\fBhg merge \-\-abort\fP\:.
++\fBhg merge \-\-abort\fP.
  .sp
  Use null as the changeset to remove the working directory (like
 -\%\fBhg clone \-U\fP\:).
@@ -3827,7 +3830,7 @@
  .TP
  .B \-C,  \-\-clean
  .
-@@ -4927,25 +4900,25 @@
+@@ -4939,25 +4912,25 @@
  specify merge tool
  .sp
  aliases: up checkout co
@@ -3858,7 +3861,7 @@
  for more information about recovery from corruption of the
  repository.
  .sp
-@@ -4955,26 +4928,26 @@
+@@ -4967,26 +4940,26 @@
  output version and copyright information:
  .sp
  .nf
@@ -3890,7 +3893,7 @@
  .sp
  Generation of bundle files is controlled by a "bundle specification"
  ("bundlespec") string. This string tells the bundle generation process how
-@@ -4981,7 +4954,7 @@
+@@ -4993,7 +4966,7 @@
  to create the bundle.
  .sp
  A "bundlespec" string is composed of the following elements:
@@ -3899,7 +3902,7 @@
  .TP
  .B type
  .
-@@ -4994,10 +4967,10 @@
+@@ -5006,10 +4979,10 @@
  .B parameters
  .
  Arbitrary key\-value parameters to further control bundle generation.
@@ -3912,7 +3915,7 @@
  .TP
  .B <type>
  .
-@@ -5006,7 +4979,7 @@
+@@ -5018,7 +4991,7 @@
  .B <compression>\-<type>
  .
  The compression engine and format are delimited by a hyphen (\fB\-\fP).
@@ -3921,7 +3924,7 @@
  .sp
  Optional parameters follow the \fB<type>\fP. Parameters are URI escaped
  \fBkey=value\fP pairs. Each pair is delimited by a semicolon (\fB;\fP). The
-@@ -5015,7 +4988,7 @@
+@@ -5027,7 +5000,7 @@
  .SS Available Types
  .sp
  The following bundle <type> strings are available:
@@ -3930,7 +3933,7 @@
  .TP
  .B v1
  .
-@@ -5042,11 +5015,11 @@
+@@ -5054,11 +5027,11 @@
  .sp
  Version 2 bundles can also use modern compression engines, such as
  \fBzstd\fP, making them faster to compress and often smaller.
@@ -3944,7 +3947,7 @@
  .TP
  .B \fBbzip2\fP
  .sp
-@@ -5074,9 +5047,9 @@
+@@ -5086,9 +5059,9 @@
  No compression is performed.
  .sp
  Use this compression engine to explicitly disable compression.
@@ -3956,7 +3959,7 @@
  .TP
  .B \fBv2\fP
  .sp
-@@ -5094,7 +5067,7 @@
+@@ -5106,7 +5079,7 @@
  .B \fBzstd\-v1\fP
  .sp
  This errors because \fBzstd\fP is not supported for \fBv1\fP types.
@@ -3965,7 +3968,7 @@
  .SH COLORIZING OUTPUTS
  .sp
  Mercurial colorizes output from several commands.
-@@ -5107,25 +5080,25 @@
+@@ -5119,25 +5092,25 @@
  To enable color (default) whenever possible use:
  .sp
  .nf
@@ -3997,7 +4000,7 @@
  the pager.  Alternately, MSYS and Cygwin shells provide \fIless\fP as a pager,
  which can be configured to support ANSI color mode.  Windows 10 natively
  supports ANSI color mode.
-@@ -5132,7 +5105,7 @@
+@@ -5144,7 +5117,7 @@
  .SS Mode
  .sp
  Mercurial can use various systems to display color. The supported modes are
@@ -4006,7 +4009,7 @@
  about how to control the mode.
  .SS Effects
  .sp
-@@ -5142,10 +5115,10 @@
+@@ -5154,10 +5127,10 @@
  available, then effects are rendered with the ECMA\-48 SGR control
  function (aka ANSI escape codes).
  .sp
@@ -4021,7 +4024,7 @@
  Some may not be available for a given terminal type, and will be
  silently ignored.
  .sp
-@@ -5154,19 +5127,19 @@
+@@ -5166,19 +5139,19 @@
  configuration:
  .sp
  .nf
@@ -4046,7 +4049,7 @@
  that case, effects given to the last label will override any other
  effects. This includes the special "none" effect, which nullifies
  other effects.
-@@ -5174,18 +5147,18 @@
+@@ -5186,18 +5159,18 @@
  Labels are normally invisible. In order to see these labels and their
  position in the text, use the global \-\-color=debug option. The same
  anchor text may be associated to multiple labels, e.g.
@@ -4070,7 +4073,7 @@
  [color]
  status.modified = blue bold underline red_background
  status.added = green bold
-@@ -5194,7 +5167,7 @@
+@@ -5206,7 +5179,7 @@
  status.unknown = magenta bold underline
  status.ignored = black bold
  
@@ -4079,7 +4082,7 @@
  status.clean = none
  status.copied = none
  
-@@ -5239,7 +5212,7 @@
+@@ -5251,7 +5224,7 @@
  shelve.name = blue bold
  
  histedit.remaining = red bold
@@ -4088,7 +4091,7 @@
  .fi
  .SS Custom colors
  .sp
-@@ -5248,22 +5221,22 @@
+@@ -5260,22 +5233,22 @@
  for your terminal type, assuming terminfo mode.  For instance:
  .sp
  .nf
@@ -4118,7 +4121,7 @@
  .IP \(bu 2
  .
  backout, commit, import, tag: Specify the commit date.
-@@ -5270,10 +5243,10 @@
+@@ -5282,10 +5255,10 @@
  .IP \(bu 2
  .
  log, revert, update: Select revision(s) by date.
@@ -4131,7 +4134,7 @@
  .IP \(bu 2
  .
  \fBWed Dec 6 13:18:29 2006\fP (local timezone assumed)
-@@ -5322,14 +5295,14 @@
+@@ -5334,14 +5307,14 @@
  .IP \(bu 2
  .
  \fBnow\fP \- right now
@@ -4150,7 +4153,7 @@
  .sp
  This is the internal representation format for dates. The first number
  is the number of seconds since the epoch (1970\-01\-01 00:00 UTC). The
-@@ -5337,7 +5310,7 @@
+@@ -5349,7 +5322,7 @@
  (negative if the timezone is east of UTC).
  .sp
  The log command also accepts date ranges:
@@ -4159,7 +4162,7 @@
  .IP \(bu 2
  .
  \fB<DATE\fP \- at or before a given date/time
-@@ -5350,16 +5323,16 @@
+@@ -5362,16 +5335,16 @@
  .IP \(bu 2
  .
  \fB\-DAYS\fP \- within a given number of days of today
@@ -4179,7 +4182,7 @@
  .IP \(bu 2
  .
  executable status and other permission bits
-@@ -5372,7 +5345,7 @@
+@@ -5384,7 +5357,7 @@
  .IP \(bu 2
  .
  creation or deletion of empty files
@@ -4188,7 +4191,7 @@
  .sp
  Mercurial also supports the extended diff format from the git VCS
  which addresses these limitations. The git diff format is not produced
-@@ -5380,26 +5353,26 @@
+@@ -5392,26 +5365,26 @@
  format.
  .sp
  This means that when generating diffs from a Mercurial repository
@@ -4222,7 +4225,7 @@
  Windows) is searched.
  .TP
  .B HGEDITOR
-@@ -5406,7 +5379,7 @@
+@@ -5418,7 +5391,7 @@
  .
  This is the name of the editor to run when committing. See EDITOR.
  .sp
@@ -4231,7 +4234,7 @@
  .TP
  .B HGENCODING
  .
-@@ -5417,9 +5390,9 @@
+@@ -5429,9 +5402,9 @@
  .TP
  .B HGENCODINGMODE
  .
@@ -4243,7 +4246,7 @@
  settings include "replace", which replaces unknown characters, and
  "ignore", which drops them. This setting can be overridden with
  the \-\-encodingmode command\-line option.
-@@ -5426,7 +5399,7 @@
+@@ -5438,7 +5411,7 @@
  .TP
  .B HGENCODINGAMBIGUOUS
  .
@@ -4252,7 +4255,7 @@
  "ambiguous" widths like accented Latin characters with East Asian
  fonts. By default, Mercurial assumes ambiguous characters are
  narrow, set this variable to "wide" if such characters cause
-@@ -5438,7 +5411,7 @@
+@@ -5450,7 +5423,7 @@
  will be executed with three arguments: local file, remote file,
  ancestor file.
  .sp
@@ -4261,7 +4264,7 @@
  .TP
  .B HGRCPATH
  .
-@@ -5448,19 +5421,19 @@
+@@ -5460,19 +5433,19 @@
  the .hg/hgrc from the current repository is read.
  .sp
  For each element in HGRCPATH:
@@ -4285,7 +4288,26 @@
  defaults, verbose mode, debug mode, quiet mode, tracebacks, and
  localization. This can be useful when scripting against Mercurial
  in the face of existing user configuration.
-@@ -5472,11 +5445,11 @@
+@@ -5479,31 +5452,31 @@
+ .sp
+ In addition to the features disabled by \fBHGPLAIN=\fP, the following
+ values can be specified to adjust behavior:
+-.INDENT 7.0
++.RS 7
+ .TP
+ .B \fB+strictflags\fP
+ .sp
+ Restrict parsing of command line flags.
+-.UNINDENT
++.RE
+ .sp
+ Equivalent options set via command line flags or environment
+ variables are not overridden.
+ .sp
+-See \%\fBhg help scripting\fP\: for details.
++See \fBhg help scripting\fP for details.
+ .TP
+ .B HGPLAINEXCEPT
  .
  This is a comma\-separated list of features to preserve when
  HGPLAIN is enabled. Currently the following values are supported:
@@ -4297,9 +4319,14 @@
 -Don\(aqt remove aliases.
 +Don't remove aliases.
  .TP
+ .B \fBcolor\fP
+ .sp
+-Don\(aqt disable colored output.
++Don't disable colored output.
+ .TP
  .B \fBi18n\fP
  .sp
-@@ -5484,16 +5457,16 @@
+@@ -5511,16 +5484,16 @@
  .TP
  .B \fBrevsetalias\fP
  .sp
@@ -4320,7 +4347,7 @@
  .sp
  Setting HGPLAINEXCEPT to anything (even an empty string) will
  enable plain mode.
-@@ -5502,7 +5475,7 @@
+@@ -5529,7 +5502,7 @@
  .
  This is the string used as the author of a commit. If not set,
  available values will be considered in this order:
@@ -4329,7 +4356,7 @@
  .IP \(bu 2
  .
  HGUSER (deprecated)
-@@ -5518,9 +5491,9 @@
+@@ -5545,9 +5518,9 @@
  .IP \(bu 2
  .
  LOGNAME (with \fB@hostname\fP appended)
@@ -4341,7 +4368,7 @@
  .TP
  .B EMAIL
  .
-@@ -5541,13 +5514,13 @@
+@@ -5568,13 +5541,13 @@
  editor it uses is determined by looking at the environment
  variables HGEDITOR, VISUAL and EDITOR, in that order. The first
  non\-empty one is chosen. If all of them are empty, the editor
@@ -4357,7 +4384,7 @@
  .SH USING ADDITIONAL FEATURES
  .sp
  Mercurial has the ability to add new features through the use of
-@@ -5560,22 +5533,22 @@
+@@ -5587,22 +5560,22 @@
  like this:
  .sp
  .nf
@@ -4385,7 +4412,7 @@
  .sp
  Extensions are not loaded by default for a variety of reasons:
  they can increase startup overhead; they may be meant for advanced
-@@ -5589,19 +5562,19 @@
+@@ -5616,19 +5589,19 @@
  broader scope, prepend its path with !:
  .sp
  .nf
@@ -4410,7 +4437,7 @@
  .TP
  .B acl
  .
-@@ -5718,9 +5691,9 @@
+@@ -5749,9 +5722,9 @@
  .B zeroconf
  .
  discover and advertise repositories on the local network
@@ -4423,7 +4450,7 @@
  .SH SPECIFYING FILE SETS
  .sp
  Mercurial supports a functional language for selecting a set of
-@@ -5727,7 +5700,7 @@
+@@ -5758,7 +5731,7 @@
  files.
  .sp
  Like other file patterns, this pattern type is indicated by a prefix,
@@ -4432,7 +4459,7 @@
  by infix operators. Parenthesis can be used for grouping.
  .sp
  Identifiers such as filenames or patterns must be quoted with single
-@@ -5738,21 +5711,21 @@
+@@ -5770,21 +5743,21 @@
  .sp
  Special characters can be used in quoted identifiers by escaping them,
  e.g., \fB\en\fP is interpreted as a newline. To prevent them from being
@@ -4459,7 +4486,7 @@
  .TP
  .B \fBx and y\fP
  .sp
-@@ -5766,15 +5739,15 @@
+@@ -5798,15 +5771,15 @@
  .B \fBx \- y\fP
  .sp
  Files in x but not in y.
@@ -4478,7 +4505,7 @@
  .TP
  .B \fBbinary()\fP
  .sp
-@@ -5782,7 +5755,7 @@
+@@ -5814,7 +5787,7 @@
  .TP
  .B \fBclean()\fP
  .sp
@@ -4487,7 +4514,7 @@
  .TP
  .B \fBcopied()\fP
  .sp
-@@ -5818,29 +5791,29 @@
+@@ -5850,29 +5823,29 @@
  .TP
  .B \fBignored()\fP
  .sp
@@ -4523,7 +4550,7 @@
  .TP
  .B \fBrevs(revs, pattern)\fP
  .sp
-@@ -5850,30 +5823,30 @@
+@@ -5882,30 +5855,30 @@
  .B \fBsize(expression)\fP
  .sp
  File size matches the given expression. Examples:
@@ -4562,7 +4589,7 @@
  .TP
  .B \fBsubrepo([pattern])\fP
  .sp
-@@ -5885,25 +5858,25 @@
+@@ -5917,25 +5890,25 @@
  .TP
  .B \fBunknown()\fP
  .sp
@@ -4594,7 +4621,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -5910,9 +5883,9 @@
+@@ -5942,9 +5915,9 @@
  Forget files that are in .hgignore but are already tracked:
  .sp
  .nf
@@ -4606,7 +4633,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -5919,9 +5892,9 @@
+@@ -5951,9 +5924,9 @@
  Find text files that contain a string:
  .sp
  .nf
@@ -4618,7 +4645,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -5928,9 +5901,9 @@
+@@ -5960,9 +5933,9 @@
  Find C files in a non\-standard encoding:
  .sp
  .nf
@@ -4631,7 +4658,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -5937,9 +5910,9 @@
+@@ -5969,9 +5942,9 @@
  Revert copies of large binary files:
  .sp
  .nf
@@ -4644,7 +4671,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -5946,9 +5919,9 @@
+@@ -5978,9 +5951,9 @@
  Revert files that were added to the working directory:
  .sp
  .nf
@@ -4657,26 +4684,180 @@
  .fi
  .IP \(bu 2
  .
-@@ -5955,13 +5928,13 @@
+@@ -5987,19 +5960,19 @@
  Remove files listed in foo.lst that contain the letter a or b:
  .sp
  .nf
 -.ft C
--hg remove "set: \(aqlistfile:foo.lst\(aq and (**a* or **b*)"
--.ft P
 +.ft
-+hg remove "set: 'listfile:foo.lst' and (**a* or **b*)"
+ hg remove "set: listfile:foo.lst and (**a* or **b*)"
+-.ft P
 +.ft
  .fi
 -.UNINDENT
 +.RE
+ .SH COMMAND\-LINE FLAGS
+ .sp
+ Most Mercurial commands accept various flags.
+ .SS Flag names
+ .sp
+-Flags for each command are listed in \%\fBhg help\fP\: for that command.
++Flags for each command are listed in \fBhg help\fP for that command.
+ Additionally, some flags, such as \-\-repository, are global and can be used with
+-any command \- those are seen in \%\fBhg help \-v\fP\:, and can be specified before or
++any command \- those are seen in \fBhg help \-v\fP, and can be specified before or
+ after the command.
+ .sp
+ Every flag has at least a long name, such as \-\-repository. Some flags may also
+@@ -6010,9 +5983,9 @@
+ specify both \-\-edit (short \-e) and \-\-interactive (short \-i), one could use:
+ .sp
+ .nf
+-.ft C
++.ft
+ hg commit \-ei
+-.ft P
++.ft
+ .fi
+ .sp
+ If any of the bundled flags takes a value (i.e. is not a boolean), it must be
+@@ -6019,9 +5992,9 @@
+ last, followed by the value:
+ .sp
+ .nf
+-.ft C
+-hg commit \-im \(aqMessage\(aq
+-.ft P
++.ft
++hg commit \-im 'Message'
++.ft
+ .fi
+ .SS Flag types
+ .sp
+@@ -6029,16 +6002,16 @@
+ strings.
+ .SS Specifying flag values
+ .sp
+-The following syntaxes are allowed, assuming a flag \(aqflagname\(aq with short name
+-\(aqf\(aq:
++The following syntaxes are allowed, assuming a flag 'flagname' with short name
++\&'f':
+ .sp
+ .nf
+-.ft C
++.ft
+ \-\-flagname=foo
+ \-\-flagname foo
+ \-f foo
+ \-ffoo
+-.ft P
++.ft
+ .fi
+ .sp
+ This syntax applies to all non\-boolean flags (strings, numbers or lists).
+@@ -6045,14 +6018,14 @@
+ .SS Specifying boolean flags
+ .sp
+ Boolean flags do not take a value parameter. To specify a boolean, use the flag
+-name to set it to true, or the same name prefixed with \(aqno\-\(aq to set it to
++name to set it to true, or the same name prefixed with 'no\-' to set it to
+ false:
+ .sp
+ .nf
+-.ft C
++.ft
+ hg commit \-\-interactive
+ hg commit \-\-no\-interactive
+-.ft P
++.ft
+ .fi
+ .SS Specifying list flags
+ .sp
+@@ -6059,9 +6032,9 @@
+ List flags take multiple values. To specify them, pass the flag multiple times:
+ .sp
+ .nf
+-.ft C
++.ft
+ hg files \-\-include mercurial \-\-include tests
+-.ft P
++.ft
+ .fi
+ .SS Setting flag defaults
+ .sp
+@@ -6069,13 +6042,13 @@
+ use aliases:
+ .sp
+ .nf
+-.ft C
++.ft
+ [alias]
+ commit = commit \-\-interactive
+-.ft P
++.ft
+ .fi
+ .sp
+-For more information on hgrc files, see \%\fBhg help config\fP\:.
++For more information on hgrc files, see \fBhg help config\fP.
+ .SS Overriding flags on the command line
+ .sp
+ If the same non\-list flag is specified multiple times on the command line, the
+@@ -6082,26 +6055,26 @@
+ latest specification is used:
+ .sp
+ .nf
+-.ft C
++.ft
+ hg commit \-m "Ignored value" \-m "Used value"
+-.ft P
++.ft
+ .fi
+ .sp
+ This includes the use of aliases \- e.g., if one has:
+ .sp
+ .nf
+-.ft C
++.ft
+ [alias]
+ committemp = commit \-m "Ignored value"
+-.ft P
++.ft
+ .fi
+ .sp
+ then the following command will override that \-m:
+ .sp
+ .nf
+-.ft C
++.ft
+ hg committemp \-m "Used value"
+-.ft P
++.ft
+ .fi
+ .SS Overriding flag defaults
+ .sp
+@@ -6111,17 +6084,17 @@
+ specifying the flag in that location.
+ .SS Hidden flags
+ .sp
+-Some flags are not shown in a command\(aqs help by default \- specifically, those
++Some flags are not shown in a command's help by default \- specifically, those
+ that are deemed to be experimental, deprecated or advanced. To show all flags,
+ add the \-\-verbose flag for the help command:
+ .sp
+ .nf
+-.ft C
++.ft
+ hg help \-\-verbose commit
+-.ft P
++.ft
+ .fi
  .SH GLOSSARY
 -.INDENT 0.0
 +.RS 0
  .TP
  .B Ancestor
  .
-@@ -5969,7 +5942,7 @@
+@@ -6129,7 +6102,7 @@
  changesets from a given changeset. More precisely, the ancestors
  of a changeset can be defined by two properties: a parent of a
  changeset is an ancestor, and a parent of an ancestor is an
@@ -4685,7 +4866,7 @@
  .TP
  .B Bookmark
  .
-@@ -5976,7 +5949,7 @@
+@@ -6136,7 +6109,7 @@
  Bookmarks are pointers to certain commits that move when
  committing. They are similar to tags in that it is possible to use
  bookmark names in all places where Mercurial expects a changeset
@@ -4694,7 +4875,7 @@
  when you make a commit.
  .sp
  Bookmarks can be renamed, copied and deleted. Bookmarks are local,
-@@ -5988,9 +5961,9 @@
+@@ -6148,9 +6121,9 @@
  .
  (Noun) A child changeset that has been created from a parent that
  is not a head. These are known as topological branches, see
@@ -4706,7 +4887,7 @@
  .sp
  Branches may be created when changes are pulled from or pushed to
  a remote repository, since new heads may be created by these
-@@ -6005,7 +5978,7 @@
+@@ -6165,7 +6138,7 @@
  (Verb) The action of creating a child changeset which results in
  its parent having more than one child.
  .sp
@@ -4715,7 +4896,7 @@
  .TP
  .B Branch, anonymous
  .
-@@ -6024,19 +5997,19 @@
+@@ -6184,19 +6157,19 @@
  .TP
  .B Branch head
  .
@@ -4740,7 +4921,7 @@
  .TP
  .B Branch, named
  .
-@@ -6043,8 +6016,8 @@
+@@ -6203,8 +6176,8 @@
  A collection of changesets which have the same branch name. By
  default, children of a changeset in a named branch belong to the
  same named branch. A child can be explicitly assigned to a
@@ -4751,7 +4932,7 @@
  branches.
  .sp
  Named branches can be thought of as a kind of namespace, dividing
-@@ -6057,7 +6030,7 @@
+@@ -6217,7 +6190,7 @@
  .TP
  .B Branch tip
  .
@@ -4760,7 +4941,7 @@
  .TP
  .B Branch, topological
  .
-@@ -6107,24 +6080,24 @@
+@@ -6267,24 +6240,24 @@
  revision. This use should probably be avoided where possible, as
  changeset is much more appropriate than checkout in this context.
  .sp
@@ -4791,7 +4972,7 @@
  .TP
  .B Clone
  .
-@@ -6133,13 +6106,13 @@
+@@ -6293,13 +6266,13 @@
  .sp
  Example: "Is your clone up to date?"
  .sp
@@ -4808,7 +4989,7 @@
  .TP
  .B Commit
  .
-@@ -6164,7 +6137,7 @@
+@@ -6324,7 +6297,7 @@
  system (DVCS) can be described as a directed acyclic graph (DAG),
  consisting of nodes and edges, where nodes correspond to
  changesets and edges imply a parent \-> child relation. This graph
@@ -4817,7 +4998,7 @@
  Mercurial, the DAG is limited by the requirement for children to
  have at most two parents.
  .TP
-@@ -6174,7 +6147,7 @@
+@@ -6334,7 +6307,7 @@
  .TP
  .B Default branch
  .
@@ -4826,7 +5007,7 @@
  .TP
  .B Descendant
  .
-@@ -6182,7 +6155,7 @@
+@@ -6342,7 +6315,7 @@
  from a given changeset. More precisely, the descendants of a
  changeset can be defined by two properties: the child of a
  changeset is a descendant, and the child of a descendant is a
@@ -4835,7 +5016,7 @@
  .TP
  .B Diff
  .
-@@ -6207,7 +6180,7 @@
+@@ -6367,7 +6340,7 @@
  Mercurial, that will be recorded in the next commit. The working
  directory initially corresponds to the snapshot at an existing
  changeset, known as the parent of the working directory. See
@@ -4844,7 +5025,7 @@
  to the files introduced manually or by a merge. The repository
  metadata exists in the .hg directory inside the working directory.
  .TP
-@@ -6215,7 +6188,7 @@
+@@ -6375,7 +6348,7 @@
  .
  Changesets in the draft phase have not been shared with publishing
  repositories and may thus be safely changed by history\-modifying
@@ -4853,7 +5034,7 @@
  .TP
  .B Experimental
  .
-@@ -6223,13 +6196,13 @@
+@@ -6383,13 +6356,13 @@
  .TP
  .B Graph
  .
@@ -4871,7 +5052,7 @@
  .sp
  Heads are where development generally takes place and are the
  usual targets for update and merge operations.
-@@ -6241,9 +6214,9 @@
+@@ -6401,9 +6374,9 @@
  .B Head, closed branch
  .
  A changeset that marks a head as no longer interesting. The closed
@@ -4883,7 +5064,7 @@
  .sp
  Closed heads can be re\-opened by committing new changeset as the
  child of the changeset that marks a head as closed.
-@@ -6272,11 +6245,11 @@
+@@ -6432,11 +6405,11 @@
  .TP
  .B Immutable history
  .
@@ -4897,7 +5078,7 @@
  .TP
  .B Manifest
  .
-@@ -6293,7 +6266,7 @@
+@@ -6453,7 +6426,7 @@
  .TP
  .B Named branch
  .
@@ -4906,7 +5087,7 @@
  .TP
  .B Null changeset
  .
-@@ -6300,30 +6273,30 @@
+@@ -6460,30 +6433,30 @@
  The empty changeset. It is the parent state of newly\-initialized
  repositories and repositories with no checked out revision. It is
  thus the parent of root changesets and the effective ancestor when
@@ -4945,7 +5126,7 @@
  .sp
  (Verb) The process of using a patch file to transform one
  changeset into another.
-@@ -6333,13 +6306,13 @@
+@@ -6493,13 +6466,13 @@
  .B Phase
  .
  A per\-changeset state tracking how the changeset has been or
@@ -4962,7 +5143,7 @@
  .TP
  .B Pull
  .
-@@ -6347,7 +6320,7 @@
+@@ -6507,7 +6480,7 @@
  not in the local repository are brought into the local
  repository. Note that this operation without special arguments
  only updates the repository, it does not update the files in the
@@ -4971,7 +5152,7 @@
  .TP
  .B Push
  .
-@@ -6355,7 +6328,7 @@
+@@ -6515,7 +6488,7 @@
  not in a remote repository are sent to the remote repository. Note
  that this operation only adds changesets which have been committed
  locally to the remote repository. Uncommitted changes are not
@@ -4980,7 +5161,7 @@
  .TP
  .B Repository
  .
-@@ -6368,13 +6341,13 @@
+@@ -6528,13 +6501,13 @@
  .TP
  .B Repository head
  .
@@ -4997,7 +5178,7 @@
  .TP
  .B Revision number
  .
-@@ -6383,7 +6356,7 @@
+@@ -6543,7 +6516,7 @@
  to a repository, starting with revision number 0. Note that the
  revision number may be different in each clone of a repository. To
  identify changesets uniquely between different clones, see
@@ -5006,7 +5187,7 @@
  .TP
  .B Revlog
  .
-@@ -6394,7 +6367,7 @@
+@@ -6554,7 +6527,7 @@
  .TP
  .B Rewriting history
  .
@@ -5015,7 +5196,7 @@
  .TP
  .B Root
  .
-@@ -6404,13 +6377,13 @@
+@@ -6564,13 +6537,13 @@
  .B Secret
  .
  Changesets in the secret phase may not be shared via push, pull,
@@ -5031,7 +5212,7 @@
  will thus automatically be shared with other using push and pull.
  .TP
  .B Tip
-@@ -6422,7 +6395,7 @@
+@@ -6582,7 +6555,7 @@
  .
  The head of a given branch with the highest revision number. When
  a branch name is used as a revision identifier, it refers to the
@@ -5040,7 +5221,7 @@
  numbers may be different in different repository clones, the
  branch tip may be different in different cloned repositories.
  .TP
-@@ -6430,22 +6403,22 @@
+@@ -6590,22 +6563,22 @@
  .
  (Noun) Another synonym of changeset.
  .sp
@@ -5068,7 +5249,7 @@
  .SH SYNTAX FOR MERCURIAL IGNORE FILES
  .SS Synopsis
  .sp
-@@ -6472,16 +6445,16 @@
+@@ -6632,16 +6605,16 @@
  .sp
  In addition, a Mercurial configuration file can reference a set of
  per\-user or global ignore files. See the \fBignore\fP configuration
@@ -5089,7 +5270,7 @@
  in .hgignore.
  .SS Syntax
  .sp
-@@ -6496,13 +6469,13 @@
+@@ -6656,13 +6629,13 @@
  To change the syntax used, use a line of the following form:
  .sp
  .nf
@@ -5106,7 +5287,7 @@
  .TP
  .B \fBregexp\fP
  .sp
-@@ -6511,7 +6484,7 @@
+@@ -6671,7 +6644,7 @@
  .B \fBglob\fP
  .sp
  Shell\-style glob.
@@ -5115,7 +5296,7 @@
  .sp
  The chosen syntax stays in effect when parsing all patterns that
  follow, until another syntax is selected.
-@@ -6523,11 +6496,11 @@
+@@ -6683,11 +6656,11 @@
  .sp
  Subdirectories can have their own .hgignore settings by adding
  \fBsubinclude:path/to/subdir/.hgignore\fP to the root \fB.hgignore\fP. See
@@ -5129,7 +5310,7 @@
  .RE
  .SS Example
  .sp
-@@ -6534,7 +6507,7 @@
+@@ -6694,7 +6667,7 @@
  Here is an example ignore file.
  .sp
  .nf
@@ -5138,7 +5319,7 @@
  # use glob syntax.
  syntax: glob
  
-@@ -6545,21 +6518,21 @@
+@@ -6705,21 +6678,21 @@
  # switch to regexp syntax.
  syntax: regexp
  ^\e.pc/
@@ -5166,7 +5347,7 @@
  .IP \(bu 2
  .
  web
-@@ -6569,11 +6542,11 @@
+@@ -6729,11 +6702,11 @@
  .IP \(bu 2
  .
  collections
@@ -5182,7 +5363,7 @@
  .sp
  The \fBpaths\fP section maps URL paths to paths of repositories in the
  filesystem. hgweb will not expose the filesystem directly \- only
-@@ -6588,7 +6561,7 @@
+@@ -6748,7 +6721,7 @@
  path ends with \fB*\fP or \fB**\fP the filesystem will be searched
  recursively for repositories below that point.
  With \fB*\fP it will not recurse into the repositories it finds (except for
@@ -5191,7 +5372,7 @@
  With \fB**\fP it will also search inside repository working directories
  and possibly find subrepositories.
  .sp
-@@ -6595,15 +6568,15 @@
+@@ -6755,15 +6728,15 @@
  In this example:
  .sp
  .nf
@@ -5210,7 +5391,7 @@
  .IP \(bu 2
  .
  The first two entries make two repositories in different directories
-@@ -6617,7 +6590,7 @@
+@@ -6777,7 +6750,7 @@
  .
  The fourth entry will publish both \fBhttp://server/user/bob/quux/\fP
  and \fBhttp://server/user/bob/quux/testsubrepo/\fP
@@ -5219,7 +5400,7 @@
  .sp
  The \fBcollections\fP section is deprecated and has been superseded by
  \fBpaths\fP.
-@@ -6640,7 +6613,7 @@
+@@ -6800,7 +6773,7 @@
  \fB/log?style=atom\fP. The hyphenated URL parameter is preferred.
  .sp
  Not all templates are available for all styles. Attempting to use
@@ -5228,7 +5409,7 @@
  rendering the page.
  .sp
  Many commands take a \fB{revision}\fP URL parameter. This defines the
-@@ -6647,7 +6620,7 @@
+@@ -6807,7 +6780,7 @@
  changeset to operate on. This is commonly specified as the short,
  12 digit hexadecimal abbreviation for the full 40 character unique
  revision identifier. However, any value described by
@@ -5237,7 +5418,7 @@
  .SS Commands and URLs
  .sp
  The following web commands and their URLs are available:
-@@ -6708,7 +6681,7 @@
+@@ -6868,7 +6841,7 @@
  .sp
  The argument for \fBrev\fP can be a single revision, a revision set,
  or a literal keyword to search for in changeset data (equivalent to
@@ -5246,7 +5427,16 @@
  .sp
  The \fBrevcount\fP query string argument defines the maximum numbers of
  changesets to render.
-@@ -6793,7 +6766,7 @@
+@@ -6943,7 +6916,7 @@
+ Information rendered by this handler can be used to create visual
+ representations of repository topology.
+ .sp
+-The \fBrevision\fP URL parameter controls the starting changeset. If it\(aqs
++The \fBrevision\fP URL parameter controls the starting changeset. If it's
+ absent, the default is \fBtip\fP.
+ .sp
+ The \fBrevcount\fP query string argument can define the number of changesets
+@@ -6958,7 +6931,7 @@
  .sp
  Render help documentation.
  .sp
@@ -5255,7 +5445,7 @@
  is defined, that help topic will be rendered. If not, an index of
  available help topics will be rendered.
  .sp
-@@ -6858,9 +6831,9 @@
+@@ -7023,9 +6996,9 @@
  .SH TECHNICAL IMPLEMENTATION TOPICS
  .sp
  To access a subtopic, use "hg help internals.{subtopic\-name}"
@@ -5268,7 +5458,7 @@
  .TP
  .B bundles
  .
-@@ -6889,9 +6862,9 @@
+@@ -7054,9 +7027,9 @@
  .B wireprotocol
  .
  Wire Protocol
@@ -5281,7 +5471,7 @@
  .SH MERGE TOOLS
  .sp
  To merge files Mercurial uses merge tools.
-@@ -6901,8 +6874,8 @@
+@@ -7066,8 +7039,8 @@
  ancestor of the two file versions, so they can determine the changes
  made on both branches.
  .sp
@@ -5292,7 +5482,7 @@
  .sp
  Usually, the merge tool tries to automatically reconcile the files by
  combining all non\-overlapping changes that occurred separately in
-@@ -6927,7 +6900,7 @@
+@@ -7092,7 +7065,7 @@
  .sp
  There are some internal merge tools which can be used. The internal
  merge tools are:
@@ -5301,7 +5491,7 @@
  .TP
  .B \fB:dump\fP
  .sp
-@@ -6938,7 +6911,7 @@
+@@ -7103,7 +7076,7 @@
  \fBa.txt.other\fP and \fBa.txt.base\fP and they will be placed in the
  same directory as \fBa.txt\fP.
  .sp
@@ -5310,7 +5500,7 @@
  runs successfully. Use :forcedump to forcibly write files out.
  .TP
  .B \fB:fail\fP
-@@ -6997,7 +6970,7 @@
+@@ -7162,7 +7135,7 @@
  Uses the internal non\-interactive simple merge algorithm for merging
  files. It will use both left and right sides for conflict regions.
  No markers are inserted.
@@ -5319,7 +5509,7 @@
  .sp
  Internal tools are always available and do not require a GUI but will by default
  not handle symlinks or binary files.
-@@ -7004,7 +6977,7 @@
+@@ -7169,7 +7142,7 @@
  .SS Choosing a merge tool
  .sp
  Mercurial uses these rules when deciding which merge tool to use:
@@ -5328,7 +5518,7 @@
  .IP 1. 3
  .
  If a tool has been specified with the \-\-tool option to merge or resolve, it
-@@ -7041,11 +7014,11 @@
+@@ -7206,11 +7179,11 @@
  .IP 8. 3
  .
  Otherwise, \fB:prompt\fP is used.
@@ -5342,7 +5532,7 @@
  succeed because of conflicting changes will Mercurial actually execute the
  merge program. Whether to use the simple merge algorithm first can be
  controlled by the premerge setting of the merge tool. Premerge is enabled by
-@@ -7062,10 +7035,10 @@
+@@ -7227,10 +7200,10 @@
  To set the pager that should be used, set the application variable:
  .sp
  .nf
@@ -5355,7 +5545,7 @@
  .fi
  .sp
  If no pager is set in the user or repository configuration, Mercurial uses the
-@@ -7075,7 +7048,7 @@
+@@ -7240,7 +7213,7 @@
  .sp
  On Windows, \fImore\fP is not color aware, so using it effectively disables color.
  MSYS and Cygwin shells provide \fIless\fP as a pager, which can be configured to
@@ -5364,7 +5554,7 @@
  the color mode when invoking a pager.
  .sp
  You can disable the pager for certain commands by adding them to the
-@@ -7082,20 +7055,20 @@
+@@ -7247,20 +7220,20 @@
  pager.ignore list:
  .sp
  .nf
@@ -5391,7 +5581,7 @@
  .IP \(bu 2
  .
  use as needed: \fIauto\fP.
-@@ -7106,17 +7079,17 @@
+@@ -7271,17 +7244,17 @@
  .
  suppress the pager: \fIno\fP or \fIoff\fP (any unrecognized value
  will also work).
@@ -5414,7 +5604,7 @@
  .fi
  .sp
  which will prevent the pager from running.
-@@ -7132,7 +7105,7 @@
+@@ -7297,7 +7270,7 @@
  .IP Note
  .
  Patterns specified in \fB.hgignore\fP are not rooted.
@@ -5423,7 +5613,7 @@
  .RE
  .sp
  To use a plain path name without any pattern matching, start it with
-@@ -7160,8 +7133,8 @@
+@@ -7325,8 +7298,8 @@
  To read a set of patterns from a file, use \fBinclude:\fP or \fBsubinclude:\fP.
  \fBinclude:\fP will use all the patterns from the given file and treat them as if
  they had been passed in manually.  \fBsubinclude:\fP will only apply the patterns
@@ -5434,7 +5624,7 @@
  .sp
  All patterns, except for \fBglob:\fP specified in command line (not for
  \fB\-I\fP or \fB\-X\fP options), can match also against directories: files
-@@ -7171,19 +7144,19 @@
+@@ -7336,19 +7309,19 @@
  Plain examples:
  .sp
  .nf
@@ -5457,7 +5647,7 @@
  glob:*.c       any name ending in ".c" in the current directory
  *.c            any name ending in ".c" in the current directory
  **.c           any name ending in ".c" in any subdirectory of the
-@@ -7194,36 +7167,36 @@
+@@ -7359,36 +7332,36 @@
  foo/*.c        any name ending in ".c" in the directory foo
  foo/**.c       any name ending in ".c" in any subdirectory of foo
                 including itself.
@@ -5502,7 +5692,7 @@
  .fi
  .SH WORKING WITH PHASES
  .SS What are phases?
-@@ -7233,9 +7206,9 @@
+@@ -7398,9 +7371,9 @@
  (for instance, with the mq or rebase extensions).
  .sp
  Each changeset in a repository is in one of the following phases:
@@ -5515,7 +5705,7 @@
  .IP \(bu 2
  .
  public : changeset is visible on a public server
-@@ -7245,9 +7218,9 @@
+@@ -7410,9 +7383,9 @@
  .IP \(bu 2
  .
  secret : changeset should not be pushed, pulled, or cloned
@@ -5528,7 +5718,7 @@
  .sp
  These phases are ordered (public < draft < secret) and no changeset
  can be in a lower phase than its ancestors. For instance, if a
-@@ -7261,17 +7234,17 @@
+@@ -7426,17 +7399,17 @@
  .sp
  Once changesets become public, extensions like mq and rebase will
  refuse to operate on them to prevent creating duplicate changesets.
@@ -5550,7 +5740,7 @@
  .fi
  .SS Phases and servers
  .sp
-@@ -7278,7 +7251,7 @@
+@@ -7443,7 +7416,7 @@
  Normally, all servers are \fBpublishing\fP by default. This means:
  .sp
  .nf
@@ -5559,7 +5749,7 @@
  \- all draft changesets that are pulled or cloned appear in phase
  public on the client
  
-@@ -7286,7 +7259,7 @@
+@@ -7451,7 +7424,7 @@
  client and server
  
  \- secret changesets are neither pushed, pulled, or cloned
@@ -5568,7 +5758,7 @@
  .fi
  .IP Note
  .
-@@ -7299,13 +7272,13 @@
+@@ -7464,13 +7437,13 @@
  repository to disable publishing in its configuration file:
  .sp
  .nf
@@ -5585,7 +5775,7 @@
  .IP Note
  .
  Servers running older versions of Mercurial are treated as
-@@ -7319,17 +7292,17 @@
+@@ -7484,17 +7457,17 @@
  of the secret changeset may be communicated to the server.
  .RE
  .SS Examples
@@ -5608,7 +5798,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -7336,9 +7309,9 @@
+@@ -7501,9 +7474,9 @@
  change all secret changesets to draft:
  .sp
  .nf
@@ -5620,7 +5810,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -7345,9 +7318,9 @@
+@@ -7510,9 +7483,9 @@
  forcibly move the current changeset and descendants from public to draft:
  .sp
  .nf
@@ -5632,7 +5822,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -7354,9 +7327,9 @@
+@@ -7519,9 +7492,9 @@
  show a list of changeset revisions and each corresponding phase:
  .sp
  .nf
@@ -5644,7 +5834,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -7363,15 +7336,15 @@
+@@ -7528,15 +7501,15 @@
  resynchronize draft changesets relative to a remote repository:
  .sp
  .nf
@@ -5666,7 +5856,7 @@
  .SH SPECIFYING REVISIONS
  .sp
  Mercurial supports several ways to specify revisions.
-@@ -7422,19 +7395,19 @@
+@@ -7587,19 +7560,19 @@
  .sp
  Special characters can be used in quoted identifiers by escaping them,
  e.g., \fB\en\fP is interpreted as a newline. To prevent them from being
@@ -5690,7 +5880,7 @@
  .TP
  .B \fBx::y\fP
  .sp
-@@ -7491,25 +7464,25 @@
+@@ -7656,25 +7629,25 @@
  For example:
  .sp
  .nf
@@ -5723,7 +5913,7 @@
  .SS Patterns
  .sp
  Where noted, predicates that perform string matching can accept a pattern
-@@ -7522,12 +7495,12 @@
+@@ -7687,12 +7660,12 @@
  insensitive match on a case\-sensitive predicate, use a regular expression,
  prefixed with \fB(?i)\fP.
  .sp
@@ -5738,7 +5928,7 @@
  .TP
  .B \fBadds(pattern)\fP
  .sp
-@@ -7564,7 +7537,7 @@
+@@ -7729,7 +7702,7 @@
  .B \fBbisect(string)\fP
  .sp
  Changesets marked in the specified bisect status:
@@ -5747,7 +5937,7 @@
  .IP \(bu 2
  .
  \fBgood\fP, \fBbad\fP, \fBskip\fP: csets explicitly marked as good/bad/skip
-@@ -7586,13 +7559,13 @@
+@@ -7751,13 +7724,13 @@
  .IP \(bu 2
  .
  \fBcurrent\fP            : the cset currently being bisected
@@ -5763,7 +5953,7 @@
  .TP
  .B \fBbranch(string or set)\fP
  .sp
-@@ -7600,7 +7573,7 @@
+@@ -7765,7 +7738,7 @@
  changesets.
  .sp
  Pattern matching is supported for \fIstring\fP. See
@@ -5772,7 +5962,7 @@
  .TP
  .B \fBbranchpoint()\fP
  .sp
-@@ -7622,8 +7595,8 @@
+@@ -7787,8 +7760,8 @@
  .TP
  .B \fBcontains(pattern)\fP
  .sp
@@ -5783,7 +5973,7 @@
  .sp
  The pattern without explicit kind like \fBglob:\fP is expected to be
  relative to the current directory and match against a file exactly
-@@ -7636,7 +7609,7 @@
+@@ -7801,7 +7774,7 @@
  .TP
  .B \fBdate(interval)\fP
  .sp
@@ -5792,7 +5982,7 @@
  .TP
  .B \fBdesc(string)\fP
  .sp
-@@ -7643,7 +7616,7 @@
+@@ -7808,7 +7781,7 @@
  Search commit message for string. The match is case\-insensitive.
  .sp
  Pattern matching is supported for \fIstring\fP. See
@@ -5801,7 +5991,7 @@
  .TP
  .B \fBdescendants(set[, depth])\fP
  .sp
-@@ -7673,7 +7646,7 @@
+@@ -7838,7 +7811,7 @@
  optional value.
  .sp
  Pattern matching is supported for \fIvalue\fP. See
@@ -5810,7 +6000,7 @@
  .TP
  .B \fBfile(pattern)\fP
  .sp
-@@ -7690,7 +7663,7 @@
+@@ -7855,7 +7828,7 @@
  .sp
  For performance reasons, visits only revisions mentioned in the file\-level
  filelog, rather than filtering through all changesets (much faster, but
@@ -5819,7 +6009,7 @@
  result, use \fBfile()\fP.
  .sp
  The pattern without explicit kind like \fBglob:\fP is expected to be
-@@ -7697,7 +7670,7 @@
+@@ -7862,7 +7835,7 @@
  relative to the current directory and match against a file exactly
  for efficiency.
  .sp
@@ -5828,13 +6018,13 @@
  work around it to return a non\-filtered value.
  .TP
  .B \fBfirst(set, [n])\fP
-@@ -7706,25 +7679,25 @@
+@@ -7871,25 +7844,25 @@
  .TP
- .B \fBfollow([pattern[, startrev]])\fP
+ .B \fBfollow([file[, startrev]])\fP
  .sp
 -An alias for \fB::.\fP (ancestors of the working directory\(aqs first parent).
 +An alias for \fB::.\fP (ancestors of the working directory's first parent).
- If pattern is specified, the histories of files matching given
+ If file pattern is specified, the histories of files matching given
  pattern in the revision given by startrev are followed, including copies.
  .TP
  .B \fBfollowlines(file, fromline:toline[, startrev=., descend=False])\fP
@@ -5861,7 +6051,7 @@
  to ensure special escape characters are handled correctly. Unlike
  \fBkeyword(string)\fP, the match is case\-sensitive.
  .TP
-@@ -7810,7 +7783,7 @@
+@@ -7975,7 +7948,7 @@
  The changesets in a given namespace.
  .sp
  Pattern matching is supported for \fInamespace\fP. See
@@ -5870,7 +6060,7 @@
  .TP
  .B \fBobsolete()\fP
  .sp
-@@ -7850,7 +7823,7 @@
+@@ -8015,7 +7988,7 @@
  .TP
  .B \fBpresent(set)\fP
  .sp
@@ -5879,7 +6069,7 @@
  all revisions in set.
  .sp
  If any of specified revisions is not present in the local repository,
-@@ -7864,7 +7837,7 @@
+@@ -8029,7 +8002,7 @@
  .B \fBremote([id [,path]])\fP
  .sp
  Local revision that corresponds to the given identifier in a
@@ -5888,7 +6078,7 @@
  synonym for the current local branch.
  .TP
  .B \fBremoves(pattern)\fP
-@@ -7897,7 +7870,7 @@
+@@ -8062,7 +8035,7 @@
  as \fB\-key\fP to sort in descending order.
  .sp
  The keys can be:
@@ -5897,7 +6087,7 @@
  .IP \(bu 2
  .
  \fBrev\fP for the revision number,
-@@ -7916,7 +7889,7 @@
+@@ -8081,7 +8054,7 @@
  .IP \(bu 2
  .
  \fBtopo\fP for a reverse topographical sort
@@ -5906,7 +6096,7 @@
  .sp
  The \fBtopo\fP sort order cannot be combined with other sort keys. This sort
  takes one optional argument, \fBtopo.firstbranch\fP, which takes a revset that
-@@ -7936,7 +7909,7 @@
+@@ -8101,7 +8074,7 @@
  The specified tag by name, or all tagged revisions if no name is given.
  .sp
  Pattern matching is supported for \fIname\fP. See
@@ -5915,7 +6105,7 @@
  .TP
  .B \fBuser(string)\fP
  .sp
-@@ -7943,8 +7916,8 @@
+@@ -8108,8 +8081,8 @@
  User name contains string. The match is case\-insensitive.
  .sp
  Pattern matching is supported for \fIstring\fP. See
@@ -5926,7 +6116,7 @@
  .SS Aliases
  .sp
  New predicates (known as "aliases") can be defined, using any combination of
-@@ -7951,9 +7924,9 @@
+@@ -8116,9 +8089,9 @@
  existing predicates or other aliases. An alias definition looks like:
  .sp
  .nf
@@ -5938,7 +6128,7 @@
  .fi
  .sp
  in the \fBrevsetalias\fP section of a Mercurial configuration file. Arguments
-@@ -7963,12 +7936,12 @@
+@@ -8128,12 +8101,12 @@
  For example,
  .sp
  .nf
@@ -5953,7 +6143,7 @@
  .fi
  .sp
  defines three aliases, \fBh\fP, \fBd\fP, and \fBrs\fP. \fBrs(0:tip, author)\fP is
-@@ -7975,10 +7948,10 @@
+@@ -8140,10 +8113,10 @@
  exactly equivalent to \fBreverse(sort(0:tip, author))\fP.
  .SS Equivalents
  .sp
@@ -5966,7 +6156,7 @@
  \-f    \->  ::.
  \-d x  \->  date(x)
  \-k x  \->  keyword(x)
-@@ -7987,20 +7960,20 @@
+@@ -8152,20 +8125,20 @@
  \-b x  \->  branch(x)
  \-P x  \->  !::x
  \-l x  \->  limit(expr, x)
@@ -5991,7 +6181,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -8007,9 +7980,9 @@
+@@ -8172,9 +8145,9 @@
  Changesets on the default branch since tag 1.5 (excluding merges):
  .sp
  .nf
@@ -6003,7 +6193,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -8016,9 +7989,9 @@
+@@ -8181,9 +8154,9 @@
  Open branch heads:
  .sp
  .nf
@@ -6015,7 +6205,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -8026,9 +7999,9 @@
+@@ -8191,9 +8164,9 @@
  \fBhgext/*\fP:
  .sp
  .nf
@@ -6028,7 +6218,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -8035,9 +8008,9 @@
+@@ -8200,9 +8173,9 @@
  Changesets committed in May 2008, sorted by user:
  .sp
  .nf
@@ -6041,7 +6231,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -8045,9 +8018,9 @@
+@@ -8210,9 +8183,9 @@
  release:
  .sp
  .nf
@@ -6053,7 +6243,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -8055,9 +8028,9 @@
+@@ -8220,9 +8193,9 @@
  bookmark (this works because the last revision of the revset is used):
  .sp
  .nf
@@ -6065,7 +6255,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -8065,11 +8038,11 @@
+@@ -8230,11 +8203,11 @@
  last revisions of the revset are used):
  .sp
  .nf
@@ -6080,7 +6270,7 @@
  .SH USING MERCURIAL FROM SCRIPTS AND AUTOMATION
  .sp
  It is common for machines (as opposed to humans) to consume Mercurial.
-@@ -8079,7 +8052,7 @@
+@@ -8244,7 +8217,7 @@
  .sp
  Machines have a choice of several methods to interface with Mercurial.
  These include:
@@ -6089,7 +6279,7 @@
  .IP \(bu 2
  .
  Executing the \fBhg\fP process
-@@ -8089,21 +8062,21 @@
+@@ -8254,21 +8227,21 @@
  .IP \(bu 2
  .
  Calling out to a command server
@@ -6117,7 +6307,7 @@
  advantage over simple \fBhg\fP process invocations in that they are
  likely more efficient. This is because there is significant overhead
  to spawn new Python processes.
-@@ -8115,14 +8088,14 @@
+@@ -8280,14 +8253,14 @@
  .RE
  .SS Environment Variables
  .sp
@@ -6135,7 +6325,7 @@
  settings that impact its encoding, verbose mode, localization, etc.
  .sp
  It is highly recommended for machines to set this variable when
-@@ -8143,7 +8116,7 @@
+@@ -8308,7 +8281,7 @@
  .B HGRCPATH
  .
  If not set, Mercurial will inherit config options from config files
@@ -6144,16 +6334,54 @@
  inheriting user or system\-wide config files.
  .sp
  When utmost control over the Mercurial configuration is desired, the
-@@ -8154,7 +8127,7 @@
+@@ -8319,17 +8292,17 @@
  consequences, as the user and system config files often define things
  like the username and extensions that may be required to interface
  with a repository.
 -.UNINDENT
 +.RE
+ .SS Command\-line Flags
+ .sp
+-Mercurial\(aqs default command\-line parser is designed for humans, and is not
++Mercurial's default command\-line parser is designed for humans, and is not
+ robust against malicious input. For instance, you can start a debugger by
+ passing \fB\-\-debugger\fP as an option value:
+ .sp
+ .nf
+-.ft C
+-$ REV=\-\-debugger sh \-c \(aqhg log \-r "$REV"\(aq
+-.ft P
++.ft
++$ REV=\-\-debugger sh \-c 'hg log \-r "$REV"'
++.ft
+ .fi
+ .sp
+ This happens because several command\-line flags need to be scanned without
+@@ -8343,18 +8316,18 @@
+ location:
+ .sp
+ .nf
+-.ft C
++.ft
+ $ HGPLAIN=+strictflags hg \-R "$REPO" log \-r "$REV"
+-.ft P
++.ft
+ .fi
+ .sp
+-In earlier Mercurial versions where \fB+strictflags\fP isn\(aqt available, you
++In earlier Mercurial versions where \fB+strictflags\fP isn't available, you
+ can mitigate the issue by concatenating an option value with its flag:
+ .sp
+ .nf
+-.ft C
++.ft
+ $ hg log \-r"$REV" \-\-keyword="$KEYWORD"
+-.ft P
++.ft
+ .fi
  .SS Consuming Command Output
  .sp
- It is common for machines to need to parse the output of Mercurial
-@@ -8178,7 +8151,7 @@
+@@ -8379,7 +8352,7 @@
  .SS Using Templates to Control Output
  .sp
  Many \fBhg\fP commands support templatized output via the
@@ -6162,7 +6390,7 @@
  .sp
  Templates are useful for explicitly controlling output so that
  you get exactly the data you want formatted how you want it. For
-@@ -8216,13 +8189,13 @@
+@@ -8417,13 +8390,13 @@
  .sp
  Commands often have varying output verbosity, even when machine
  readable styles are being used (e.g. \fB\-T json\fP). Adding
@@ -6178,7 +6406,7 @@
  .TP
  .B revsets
  .
-@@ -8230,7 +8203,7 @@
+@@ -8431,7 +8404,7 @@
  of revisions. Think of it as SQL for Mercurial repositories. Revsets
  are useful for querying repositories for specific data.
  .sp
@@ -6187,7 +6415,7 @@
  .TP
  .B share extension
  .
-@@ -8244,8 +8217,8 @@
+@@ -8445,8 +8418,8 @@
  network. This is especially true for continuous integration (CI)
  environments.
  .sp
@@ -6198,7 +6426,7 @@
  .SH SUBREPOSITORIES
  .sp
  Subrepositories let you nest external repositories or projects into a
-@@ -8256,7 +8229,7 @@
+@@ -8457,7 +8430,7 @@
  subrepositories.
  .sp
  Subrepositories are made of three components:
@@ -6207,7 +6435,7 @@
  .IP 1. 3
  .
  Nested repository checkouts. They can appear anywhere in the
-@@ -8269,18 +8242,18 @@
+@@ -8470,18 +8443,18 @@
  subrepositories are referenced like:
  .sp
  .nf
@@ -6230,7 +6458,7 @@
  .fi
  .sp
  where \fBpath/to/nested\fP is the checkout location relatively to the
-@@ -8303,7 +8276,7 @@
+@@ -8504,7 +8477,7 @@
  .
  The \fB.hgsubstate\fP file should not be edited manually.
  .RE
@@ -6239,7 +6467,7 @@
  .SS Adding a Subrepository
  .sp
  If \fB.hgsub\fP does not exist, create it and add it to the parent
-@@ -8311,7 +8284,7 @@
+@@ -8512,7 +8485,7 @@
  to live in the parent repository. Edit \fB.hgsub\fP and add the
  subrepository entry as described above. At this point, the
  subrepository is tracked and the next commit will record its state in
@@ -6248,7 +6476,7 @@
  .SS Synchronizing a Subrepository
  .sp
  Subrepos do not automatically track the latest changeset of their
-@@ -8328,7 +8301,7 @@
+@@ -8529,7 +8502,7 @@
  To remove a subrepository from the parent repository, delete its
  reference from \fB.hgsub\fP, then remove its files.
  .SS Interaction with Mercurial Commands
@@ -6257,7 +6485,7 @@
  .TP
  .B add
  .
-@@ -8363,7 +8336,7 @@
+@@ -8564,7 +8537,7 @@
  have been modified, Mercurial will abort.  Mercurial can be made
  to instead commit all modified subrepositories by specifying
  \-S/\-\-subrepos, or setting "ui.commitsubrepos=True" in a
@@ -6266,7 +6494,7 @@
  longer any modified subrepositories, it records their state and
  finally commits it in the parent repository.  The \-\-addremove
  option also honors the \-S/\-\-subrepos option.  However, Git and
-@@ -8403,7 +8376,7 @@
+@@ -8604,7 +8577,7 @@
  .B pull
  .
  pull is not recursive since it is not clear what to pull prior
@@ -6275,7 +6503,7 @@
  subrepositories changes referenced by the parent repository pulled
  changesets is expensive at best, impossible in the Subversion
  case.
-@@ -8444,7 +8417,7 @@
+@@ -8645,7 +8618,7 @@
  changeset is not available in the current subrepository, Mercurial
  will pull it in first before updating.  This means that updating
  can require network access when using subrepositories.
@@ -6284,7 +6512,7 @@
  .SS Remapping Subrepositories Sources
  .sp
  A subrepository source location may change during a project life,
-@@ -8462,12 +8435,12 @@
+@@ -8663,12 +8636,12 @@
  outgoing, incoming, tip, parents, and heads.
  .sp
  Some built\-in styles are packaged with Mercurial. These can be listed
@@ -6300,7 +6528,7 @@
  .fi
  .sp
  A template is a piece of text, with markup to invoke variable
-@@ -8474,10 +8447,10 @@
+@@ -8675,10 +8648,10 @@
  expansion:
  .sp
  .nf
@@ -6313,7 +6541,7 @@
  .fi
  .SS Keywords
  .sp
-@@ -8484,7 +8457,7 @@
+@@ -8685,7 +8658,7 @@
  Strings in curly braces are called keywords. The availability of
  keywords depends on the exact context of the templater. These
  keywords are usually available for templating a log\-like command:
@@ -6322,7 +6550,7 @@
  .TP
  .B activebookmark
  .
-@@ -8501,7 +8474,7 @@
+@@ -8702,7 +8675,7 @@
  .B bookmarks
  .
  List of strings. Any bookmarks associated with the
@@ -6331,7 +6559,7 @@
  .TP
  .B branch
  .
-@@ -8531,7 +8504,7 @@
+@@ -8732,7 +8705,7 @@
  .TP
  .B extras
  .
@@ -6340,7 +6568,7 @@
  field of this changeset.
  .TP
  .B file_adds
-@@ -8568,7 +8541,7 @@
+@@ -8769,7 +8742,7 @@
  .TP
  .B graphwidth
  .
@@ -6349,7 +6577,7 @@
  .TP
  .B index
  .
-@@ -8596,24 +8569,24 @@
+@@ -8797,24 +8770,24 @@
  .TP
  .B p1node
  .
@@ -6378,11 +6606,15 @@
  second parent, or \-1 if the changeset has no second parent.
  .TP
  .B parents
-@@ -8650,25 +8623,25 @@
- .B termwidth
+@@ -8850,27 +8823,27 @@
+ .TP
+ .B verbosity
  .
- Integer. The width of the current terminal.
+-String. The current output verbosity in \(aqdebug\(aq, \(aqquiet\(aq, \(aqverbose\(aq,
+-or \(aq\(aq.
 -.UNINDENT
++String. The current output verbosity in 'debug', 'quiet', 'verbose',
++or ''.
 +.RE
  .sp
  The "date" keyword does not produce human\-readable output. If you
@@ -6409,7 +6641,7 @@
  .TP
  .B addbreaks
  .
-@@ -8751,7 +8724,7 @@
+@@ -8952,7 +8925,7 @@
  .TP
  .B nonempty
  .
@@ -6418,7 +6650,7 @@
  .TP
  .B obfuscate
  .
-@@ -8831,7 +8804,7 @@
+@@ -9036,7 +9009,7 @@
  .B utf8
  .
  Any text. Converts from the local character encoding to UTF\-8.
@@ -6427,7 +6659,7 @@
  .sp
  Note that a filter is nothing more than a function call, i.e.
  \fBexpr|filter\fP is equivalent to \fBfilter(expr)\fP.
-@@ -8838,11 +8811,11 @@
+@@ -9043,11 +9016,11 @@
  .SS Functions
  .sp
  In addition to filters, there are some basic built\-in functions:
@@ -6441,7 +6673,7 @@
  strings. The default is a Unix date format, including the timezone:
  "Mon Sep 04 15:13:13 2006 0700".
  .TP
-@@ -8859,7 +8832,7 @@
+@@ -9064,7 +9037,7 @@
  .B files(pattern)
  .
  All files of the current changeset matching the pattern. See
@@ -6450,7 +6682,7 @@
  .TP
  .B fill(text[, width[, initialident[, hangindent]]])
  .
-@@ -8928,7 +8901,7 @@
+@@ -9133,7 +9106,7 @@
  .
  Calculate a mod b such that a / b + a mod b == a
  .TP
@@ -6459,7 +6691,7 @@
  .
  Pad text with a
  fill character.
-@@ -8941,7 +8914,7 @@
+@@ -9146,7 +9119,7 @@
  .B revset(query[, formatargs...])
  .
  Execute a revision set query. See
@@ -6468,7 +6700,7 @@
  .TP
  .B rstdoc(text, style)
  .
-@@ -8974,18 +8947,18 @@
+@@ -9179,18 +9152,18 @@
  .B word(number, text[, separator])
  .
  Return the nth word from a string.
@@ -6490,7 +6722,7 @@
  .fi
  .sp
  Division fulfills the law x = x / y + mod(x, y).
-@@ -8993,25 +8966,25 @@
+@@ -9198,25 +9171,25 @@
  Also, for any expression that returns a list, there is a list operator:
  .sp
  .nf
@@ -6523,7 +6755,7 @@
  .SS Aliases
  .sp
  New keywords and functions can be defined in the \fBtemplatealias\fP section of
-@@ -9018,9 +8991,9 @@
+@@ -9223,9 +9196,9 @@
  a Mercurial configuration file:
  .sp
  .nf
@@ -6535,7 +6767,7 @@
  .fi
  .sp
  Arguments of the form \fIa1\fP, \fIa2\fP, etc. are substituted from the alias into
-@@ -9029,35 +9002,35 @@
+@@ -9234,35 +9207,35 @@
  For example,
  .sp
  .nf
@@ -6579,7 +6811,7 @@
  .fi
  .sp
  A template defined in \fBtemplates\fP section can also be referenced from
-@@ -9064,9 +9037,9 @@
+@@ -9269,9 +9242,9 @@
  another template:
  .sp
  .nf
@@ -6591,7 +6823,7 @@
  .fi
  .sp
  but be aware that the keywords cannot be overridden by templates. For example,
-@@ -9076,26 +9049,26 @@
+@@ -9281,26 +9254,26 @@
  are inserted before/after/between items:
  .sp
  .nf
@@ -6628,7 +6860,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -9102,9 +9075,9 @@
+@@ -9307,9 +9280,9 @@
  Join the list of files with a ", ":
  .sp
  .nf
@@ -6641,7 +6873,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -9111,9 +9084,9 @@
+@@ -9316,9 +9289,9 @@
  Join the list of files ending with ".py" with a ", ":
  .sp
  .nf
@@ -6654,7 +6886,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -9120,9 +9093,9 @@
+@@ -9325,9 +9298,9 @@
  Separate non\-empty arguments by a " ":
  .sp
  .nf
@@ -6667,7 +6899,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -9129,9 +9102,9 @@
+@@ -9334,9 +9307,9 @@
  Modify each line of a commit description:
  .sp
  .nf
@@ -6680,7 +6912,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -9138,9 +9111,9 @@
+@@ -9343,9 +9316,9 @@
  Format date:
  .sp
  .nf
@@ -6693,7 +6925,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -9147,9 +9120,9 @@
+@@ -9352,9 +9325,9 @@
  Display date in UTC:
  .sp
  .nf
@@ -6706,7 +6938,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -9156,9 +9129,9 @@
+@@ -9361,9 +9334,9 @@
  Output the description set to a fill\-width of 30:
  .sp
  .nf
@@ -6718,7 +6950,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -9165,10 +9138,10 @@
+@@ -9370,10 +9343,10 @@
  Use a conditional to test for the default branch:
  .sp
  .nf
@@ -6733,7 +6965,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -9175,9 +9148,9 @@
+@@ -9380,9 +9353,9 @@
  Append a newline if not empty:
  .sp
  .nf
@@ -6746,7 +6978,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -9184,9 +9157,9 @@
+@@ -9389,9 +9362,9 @@
  Label the output for use with the color extension:
  .sp
  .nf
@@ -6759,7 +6991,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -9193,27 +9166,27 @@
+@@ -9398,27 +9371,27 @@
  Invert the firstline filter, i.e. everything but the first line:
  .sp
  .nf
@@ -6798,7 +7030,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -9220,18 +9193,18 @@
+@@ -9425,18 +9398,18 @@
  Find the previous release candidate tag, the distance and changes since the tag:
  .sp
  .nf
@@ -6824,7 +7056,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -9238,9 +9211,9 @@
+@@ -9443,9 +9416,9 @@
  Show details of parent revisions:
  .sp
  .nf
@@ -6837,7 +7069,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -9247,9 +9220,9 @@
+@@ -9452,9 +9425,9 @@
  Show only commit descriptions that start with "template":
  .sp
  .nf
@@ -6850,7 +7082,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -9256,34 +9229,34 @@
+@@ -9461,34 +9434,34 @@
  Print the first word of each line of a commit message:
  .sp
  .nf
@@ -6895,7 +7127,7 @@
  possible if the feature is explicitly enabled on the remote Mercurial
  server.
  .sp
-@@ -9291,7 +9264,7 @@
+@@ -9496,7 +9469,7 @@
  web.cacerts.
  .sp
  Some notes about using SSH with Mercurial:
@@ -6904,8 +7136,8 @@
  .IP \(bu 2
  .
  SSH requires an accessible shell account on the destination machine
-@@ -9298,63 +9271,63 @@
- and a copy of hg in the remote path or specified with as remotecmd.
+@@ -9503,63 +9476,63 @@
+ and a copy of hg in the remote path or specified with remotecmd.
  .IP \(bu 2
  .
 -path is relative to the remote user\(aqs home directory by default. Use
@@ -6984,7 +7216,7 @@
  .SH EXTENSIONS
  .sp
  This section contains help for extensions that are distributed together with Mercurial. Help for other extensions is available in the help system.
-@@ -9378,7 +9351,7 @@
+@@ -9583,7 +9556,7 @@
  distinguish them.
  .sp
  The order in which access checks are performed is:
@@ -6993,7 +7225,7 @@
  .IP 1. 3
  .
  Deny  list for branches (section \fBacl.deny.branches\fP)
-@@ -9391,7 +9364,7 @@
+@@ -9596,7 +9569,7 @@
  .IP 4. 3
  .
  Allow list for paths    (section \fBacl.allow\fP)
@@ -7002,7 +7234,7 @@
  .sp
  The allow and deny sections take key\-value pairs.
  .SS Branch\-based Access Control
-@@ -9399,7 +9372,7 @@
+@@ -9604,7 +9577,7 @@
  Use the \fBacl.deny.branches\fP and \fBacl.allow.branches\fP sections to
  have branch\-based access control. Keys in these sections can be
  either:
@@ -7011,7 +7243,7 @@
  .IP \(bu 2
  .
  a branch name, or
-@@ -9406,10 +9379,10 @@
+@@ -9611,10 +9584,10 @@
  .IP \(bu 2
  .
  an asterisk, to match any branch;
@@ -7024,7 +7256,7 @@
  .IP \(bu 2
  .
  a comma\-separated list containing users and groups, or
-@@ -9416,7 +9389,7 @@
+@@ -9621,7 +9594,7 @@
  .IP \(bu 2
  .
  an asterisk, to match anyone;
@@ -7033,7 +7265,7 @@
  .sp
  You can add the "!" prefix to a user or group name to invert the sense
  of the match.
-@@ -9438,7 +9411,7 @@
+@@ -9643,7 +9616,7 @@
  .SS Example Configuration
  .sp
  .nf
@@ -7042,7 +7274,7 @@
  [hooks]
  
  # Use this if you want to check access restrictions at commit time
-@@ -9514,12 +9487,12 @@
+@@ -9719,12 +9692,12 @@
  src/main/resources/** = *
  
  \&.hgtags = release_engineer
@@ -7058,7 +7290,7 @@
  be created.
  .sp
  The "!" prefix allows you to prevent anyone except a given user or group to
-@@ -9531,18 +9504,18 @@
+@@ -9736,18 +9709,18 @@
  3) Deny access to a file to anyone but user "gollum"
  .sp
  .nf
@@ -7082,7 +7314,7 @@
  lake = !@hobbit
  
  # You can also deny access based on file paths:
-@@ -9551,10 +9524,10 @@
+@@ -9756,10 +9729,10 @@
  # Empty
  
  [acl.deny]
@@ -7096,7 +7328,7 @@
  .fi
  .SS amend
  .sp
-@@ -9568,18 +9541,18 @@
+@@ -9773,18 +9746,18 @@
  amend the working copy parent with all or specified outstanding changes:
  .sp
  .nf
@@ -7120,7 +7352,7 @@
  .TP
  .B \-A,  \-\-addremove
  .
-@@ -9620,7 +9593,7 @@
+@@ -9825,7 +9798,7 @@
  .BI \-u,  \-\-user \ <USER>
  .
  record the specified user as committer
@@ -7129,7 +7361,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS automv
-@@ -9643,7 +9616,7 @@
+@@ -9848,7 +9821,7 @@
  Examples:
  .sp
  .nf
@@ -7138,7 +7370,7 @@
  [blackbox]
  track = *
  # dirty is *EXPENSIVE* (slow);
-@@ -9663,7 +9636,7 @@
+@@ -9868,7 +9841,7 @@
  maxsize = 1.5 MB
  # rotate up to N log files when the current one gets too big
  maxfiles = 3
@@ -7147,7 +7379,7 @@
  .fi
  .SS Commands
  .SS blackbox
-@@ -9671,20 +9644,20 @@
+@@ -9876,20 +9849,20 @@
  view the recent repository events:
  .sp
  .nf
@@ -7172,7 +7404,7 @@
  .SS bugzilla
  .sp
  hooks for integrating with the Bugzilla bug tracker
-@@ -9697,7 +9670,7 @@
+@@ -9902,7 +9875,7 @@
  hours spent working on the bug. Bugs can also be marked fixed.
  .sp
  Four basic modes of access to Bugzilla are provided:
@@ -7181,7 +7413,7 @@
  .IP 1. 3
  .
  Access via the Bugzilla REST\-API. Requires bugzilla 5.0 or later.
-@@ -9712,7 +9685,7 @@
+@@ -9917,7 +9890,7 @@
  .
  Writing directly to the Bugzilla database. Only Bugzilla installations
  using MySQL are supported. Requires Python MySQLdb.
@@ -7190,7 +7422,7 @@
  .sp
  Writing directly to the database is susceptible to schema changes, and
  relies on a Bugzilla contrib script to send out bug change
-@@ -9744,12 +9717,12 @@
+@@ -9949,12 +9922,12 @@
  the given username or the user associated with the apikey in Bugzilla.
  .sp
  Configuration items common to all access modes:
@@ -7205,7 +7437,7 @@
  .TP
  .B \fBrestapi\fP
  .sp
-@@ -9776,7 +9749,7 @@
+@@ -9981,7 +9954,7 @@
  .sp
  MySQL access, Bugzilla 2.16 and up to but not
  including 2.18.
@@ -7214,7 +7446,7 @@
  .TP
  .B bugzilla.regexp
  .
-@@ -9821,7 +9794,7 @@
+@@ -10026,7 +9999,7 @@
  Template to use when formatting comments. Overrides style if
  specified. In addition to the usual Mercurial keywords, the
  extension specifies:
@@ -7223,7 +7455,7 @@
  .TP
  .B \fB{bug}\fP
  .sp
-@@ -9838,7 +9811,7 @@
+@@ -10043,7 +10016,7 @@
  .B \fB{hgweb}\fP
  .sp
  Base URL for browsing Mercurial repositories.
@@ -7232,7 +7464,7 @@
  .sp
  Default \fBchangeset {node|short} in repo {root} refers to bug
  {bug}.\endetails:\en\et{desc|tabindent}\fP
-@@ -9855,10 +9828,10 @@
+@@ -10060,10 +10033,10 @@
  .
  Base URL for browsing Mercurial repositories. Referenced from
  templates as \fB{hgweb}\fP.
@@ -7245,7 +7477,7 @@
  .TP
  .B bugzilla.usermap
  .
-@@ -9867,13 +9840,13 @@
+@@ -10072,13 +10045,13 @@
  line:
  .sp
  .nf
@@ -7262,7 +7494,7 @@
  .sp
  The \fB[usermap]\fP section is used to specify mappings of Mercurial
  committer email to Bugzilla user email. See also \fBbugzilla.usermap\fP.
-@@ -9880,7 +9853,7 @@
+@@ -10085,7 +10058,7 @@
  Contains entries of the form \fBcommitter = Bugzilla user\fP.
  .sp
  XMLRPC and REST\-API access mode configuration:
@@ -7271,7 +7503,7 @@
  .TP
  .B bugzilla.bzurl
  .
-@@ -9895,10 +9868,10 @@
+@@ -10100,10 +10073,10 @@
  .B bugzilla.password
  .
  The password for Bugzilla login.
@@ -7284,7 +7516,7 @@
  .TP
  .B bugzilla.apikey
  .
-@@ -9905,22 +9878,22 @@
+@@ -10110,22 +10083,22 @@
  An apikey generated on the Bugzilla instance for api access.
  Using an apikey removes the need to store the user and password
  options.
@@ -7311,7 +7543,7 @@
  .TP
  .B bugzilla.host
  .
-@@ -9960,12 +9933,12 @@
+@@ -10165,12 +10138,12 @@
  id) and \fBuser\fP (committer bugzilla email). Default depends on
  version; from 2.18 it is "cd %(bzdir)s && perl \-T
  contrib/sendbugmail.pl %(id)s %(user)s".
@@ -7326,7 +7558,7 @@
  [extensions]
  bugzilla =
  
-@@ -9972,7 +9945,7 @@
+@@ -10177,7 +10150,7 @@
  [hooks]
  # run bugzilla hook on every change pulled or pushed in here
  incoming.bugzilla = python:hgext.bugzilla.hook
@@ -7335,7 +7567,7 @@
  .fi
  .sp
  Example configurations:
-@@ -9984,7 +9957,7 @@
+@@ -10189,7 +10162,7 @@
  with a web interface at \fBhttp://my\-project.org/hg\fP.
  .sp
  .nf
@@ -7344,7 +7576,7 @@
  [bugzilla]
  bzurl=http://my\-project.org/bugzilla
  user=bugmail@my\-project.org
-@@ -9997,7 +9970,7 @@
+@@ -10202,7 +10175,7 @@
  
  [web]
  baseurl=http://my\-project.org/hg
@@ -7353,7 +7585,7 @@
  .fi
  .sp
  XMLRPC+email example configuration. This uses the Bugzilla at
-@@ -10009,7 +9982,7 @@
+@@ -10214,7 +10187,7 @@
  \fBbugzilla@my\-project.org\fP.
  .sp
  .nf
@@ -7362,7 +7594,7 @@
  [bugzilla]
  bzurl=http://my\-project.org/bugzilla
  user=bugmail@my\-project.org
-@@ -10026,7 +9999,7 @@
+@@ -10231,7 +10204,7 @@
  
  [usermap]
  user@emaildomain.com=user.name@bugzilladomain.com
@@ -7371,7 +7603,7 @@
  .fi
  .sp
  MySQL example configuration. This has a local Bugzilla 3.2 installation
-@@ -10037,7 +10010,7 @@
+@@ -10242,7 +10215,7 @@
  with a web interface at \fBhttp://my\-project.org/hg\fP.
  .sp
  .nf
@@ -7380,7 +7612,7 @@
  [bugzilla]
  host=localhost
  password=XYZZY
-@@ -10054,18 +10027,18 @@
+@@ -10259,18 +10232,18 @@
  
  [usermap]
  user@emaildomain.com=user.name@bugzilladomain.com
@@ -7402,7 +7634,7 @@
  .fi
  .SS censor
  .sp
-@@ -10079,14 +10052,14 @@
+@@ -10284,14 +10257,14 @@
  Typical uses for censor are due to security or legal requirements, including:
  .sp
  .nf
@@ -7420,7 +7652,7 @@
  data needs to be materialized. Some commands, like \fBhg cat\fP/\fBhg revert\fP,
  simply fail when asked to produce censored data. Others, like \fBhg verify\fP and
  \fBhg update\fP, must be capable of tolerating censored data to continue to
-@@ -10096,13 +10069,13 @@
+@@ -10301,13 +10274,13 @@
  .SS censor
  .sp
  .nf
@@ -7437,7 +7669,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
-@@ -10111,13 +10084,13 @@
+@@ -10316,13 +10289,13 @@
  .BI \-t,  \-\-tombstone \ <TEXT>
  .
  replacement tombstone data
@@ -7454,7 +7686,7 @@
  .SS Commands
  .SS children
  .sp
-@@ -10124,30 +10097,30 @@
+@@ -10329,30 +10302,30 @@
  show the children of the given or working directory revision:
  .sp
  .nf
@@ -7493,7 +7725,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
-@@ -10160,7 +10133,7 @@
+@@ -10365,7 +10338,7 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template
@@ -7502,7 +7734,7 @@
  .SS churn
  .sp
  command to display statistics about repository history
-@@ -10170,9 +10143,9 @@
+@@ -10375,9 +10348,9 @@
  histogram of changes to the repository:
  .sp
  .nf
@@ -7514,7 +7746,7 @@
  .fi
  .sp
  This command will display a histogram representing the number
-@@ -10188,7 +10161,7 @@
+@@ -10393,7 +10366,7 @@
  Examples:
  .sp
  .nf
@@ -7523,7 +7755,7 @@
  # display count of changed lines for every committer
  hg churn \-T "{author|email}"
  
-@@ -10200,7 +10173,7 @@
+@@ -10405,7 +10378,7 @@
  
  # display count of lines changed in every year
  hg churn \-f "%Y" \-s
@@ -7532,7 +7764,7 @@
  .fi
  .sp
  It is possible to map alternate email addresses to a main address
-@@ -10207,9 +10180,9 @@
+@@ -10412,9 +10385,9 @@
  by providing a file using the following format:
  .sp
  .nf
@@ -7544,7 +7776,7 @@
  .fi
  .sp
  Such a file may be specified with the \-\-aliases option, otherwise
-@@ -10217,7 +10190,7 @@
+@@ -10422,7 +10395,7 @@
  Aliases will be split from the rightmost "=".
  .sp
  Options:
@@ -7553,7 +7785,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV[+]>
  .
-@@ -10262,7 +10235,7 @@
+@@ -10467,7 +10440,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -7562,7 +7794,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS clonebundles
-@@ -10275,7 +10248,7 @@
+@@ -10480,7 +10453,7 @@
  resources on the server.
  .sp
  Cloning can be a CPU and I/O intensive operation on servers. Traditionally,
@@ -7571,7 +7803,7 @@
  a bundle containing the entire repository content and sends it to the client.
  There is no caching on the server and the server will have to redundantly
  generate the same outgoing bundle in response to each clone request. For
-@@ -10283,8 +10256,8 @@
+@@ -10488,8 +10461,8 @@
  clones can make scaling the server challenging and costly.
  .sp
  This extension provides server operators the ability to offload potentially
@@ -7582,7 +7814,7 @@
  .IP 1. 3
  .
  A server operator establishes a mechanism for making bundle files available
-@@ -10311,10 +10284,10 @@
+@@ -10516,10 +10489,10 @@
  .IP 7. 3
  .
  The client reconnects to the original server and performs the equivalent
@@ -7595,7 +7827,7 @@
  .sp
  Instead of the server generating full repository bundles for every clone
  request, it generates full bundles once and they are subsequently reused to
-@@ -10324,7 +10297,7 @@
+@@ -10529,7 +10502,7 @@
  clones to less than 1% of original.
  .sp
  To work, this extension requires the following of server operators:
@@ -7604,7 +7836,7 @@
  .IP \(bu 2
  .
  Generating bundle files of repository content (typically periodically,
-@@ -10338,23 +10311,23 @@
+@@ -10543,23 +10516,23 @@
  .
  A process for keeping the bundles manifest in sync with available bundle
  files.
@@ -7634,7 +7866,7 @@
  operators need to be aware that newer versions of Mercurial may produce
  streaming clone bundles incompatible with older Mercurial versions.\fP
  .sp
-@@ -10366,12 +10339,12 @@
+@@ -10571,12 +10544,12 @@
  The manifest file contains a newline (n) delimited list of entries.
  .sp
  Each line in this file defines an available bundle. Lines have the format:
@@ -7651,7 +7883,7 @@
  .sp
  That is, a URL followed by an optional, space\-delimited list of key=value
  pairs describing additional properties of this bundle. Both keys and values
-@@ -10384,7 +10357,7 @@
+@@ -10589,7 +10562,7 @@
  data center closest to them.
  .sp
  The following reserved keys are currently defined:
@@ -7660,7 +7892,7 @@
  .TP
  .B BUNDLESPEC
  .
-@@ -10391,21 +10364,21 @@
+@@ -10596,21 +10569,21 @@
  A "bundle specification" string that describes the type of the bundle.
  .sp
  These are string values that are accepted by the "\-\-type" argument of
@@ -7686,7 +7918,7 @@
  clients will still sniff the bundle type from the header of downloaded
  files.
  .sp
-@@ -10427,10 +10400,10 @@
+@@ -10632,10 +10605,10 @@
  with the clonebundles facility.
  .sp
  Value should be "true".
@@ -7699,7 +7931,7 @@
  entries are optionally sorted by client preferences
  (\fBui.clonebundleprefers\fP config option). The client then attempts
  to fetch the bundle at the first URL in the remaining list.
-@@ -10440,7 +10413,7 @@
+@@ -10645,7 +10618,7 @@
  for this is that if a server is using clone bundles, it is probably doing so
  because the feature is necessary to help it scale. In other words, there
  is an assumption that clone load will be offloaded to another service and
@@ -7708,7 +7940,7 @@
  If that other service experiences issues and clients start mass falling back to
  the original Mercurial server, the added clone load could overwhelm the server
  due to unexpected load and effectively take it offline. Not having clients
-@@ -10468,13 +10441,13 @@
+@@ -10673,13 +10646,13 @@
  convert a foreign SCM repository to a Mercurial one.:
  .sp
  .nf
@@ -7725,7 +7957,7 @@
  .IP \(bu 2
  .
  Mercurial [hg]
-@@ -10502,10 +10475,10 @@
+@@ -10707,10 +10680,10 @@
  .IP \(bu 2
  .
  Perforce [p4]
@@ -7738,7 +7970,7 @@
  .IP \(bu 2
  .
  Mercurial [hg]
-@@ -10512,7 +10485,7 @@
+@@ -10717,7 +10690,7 @@
  .IP \(bu 2
  .
  Subversion [svn] (history on branches is not preserved)
@@ -7747,7 +7979,7 @@
  .sp
  If no revision is given, all revisions will be converted.
  Otherwise, convert will only import up to the named revision
-@@ -10520,12 +10493,12 @@
+@@ -10725,12 +10698,12 @@
  .sp
  If no destination directory name is specified, it defaults to the
  basename of the source with \fB\-hg\fP appended. If the destination
@@ -7762,7 +7994,7 @@
  .TP
  .B \-\-branchsort
  .
-@@ -10550,21 +10523,21 @@
+@@ -10755,21 +10728,21 @@
  try to move closed revisions as close as possible
  to parent branches, only supported by Mercurial
  sources.
@@ -7790,7 +8022,7 @@
  and can be run repeatedly to copy new commits.
  .sp
  The authormap is a simple text file that maps each source commit
-@@ -10573,9 +10546,9 @@
+@@ -10778,9 +10751,9 @@
  author mapping and the line format is:
  .sp
  .nf
@@ -7802,7 +8034,7 @@
  .fi
  .sp
  Empty lines and lines starting with a \fB#\fP are ignored.
-@@ -10585,13 +10558,13 @@
+@@ -10790,13 +10763,13 @@
  directives:
  .sp
  .nf
@@ -7818,7 +8050,7 @@
  .fi
  .sp
  Comment lines start with \fB#\fP. A specified path matches if it
-@@ -10624,9 +10597,9 @@
+@@ -10829,9 +10802,9 @@
  comma\-separated values:
  .sp
  .nf
@@ -7830,7 +8062,7 @@
  .fi
  .sp
  The key is the revision ID in the source
-@@ -10646,9 +10619,9 @@
+@@ -10851,9 +10824,9 @@
  lines of the form:
  .sp
  .nf
@@ -7842,7 +8074,7 @@
  .fi
  .sp
  where "original_branch_name" is the name of the branch in the
-@@ -10660,7 +10633,7 @@
+@@ -10865,7 +10838,7 @@
  .sp
  The Mercurial source recognizes the following configuration
  options, which you can set on the command line with \fB\-\-config\fP:
@@ -7851,7 +8083,7 @@
  .TP
  .B convert.hg.ignoreerrors
  .
-@@ -10682,7 +10655,7 @@
+@@ -10887,7 +10860,7 @@
  .B convert.hg.revs
  .
  revset specifying the source revisions to convert.
@@ -7860,7 +8092,7 @@
  .SS CVS Source
  .sp
  CVS source will use a sandbox (i.e. a checked\-out copy) from CVS
-@@ -10696,7 +10669,7 @@
+@@ -10901,7 +10874,7 @@
  sandbox is ignored.
  .sp
  The following options can be used with \fB\-\-config\fP:
@@ -7869,7 +8101,7 @@
  .TP
  .B convert.cvsps.cache
  .
-@@ -10715,7 +10688,7 @@
+@@ -10920,7 +10893,7 @@
  .
  Specify encoding name to be used for
  transcoding CVS log messages. Multiple encoding names can be
@@ -7878,7 +8110,7 @@
  the first acceptable encoding in the list is used per CVS log
  entries. This transcoding is executed before cvslog hook below.
  .TP
-@@ -10755,7 +10728,7 @@
+@@ -10960,7 +10933,7 @@
  the changesets are calculated from the CVS log. The
  function is passed a list with the changeset entries, and can
  modify the changesets in\-place, or add or delete them.
@@ -7887,7 +8119,7 @@
  .sp
  An additional "debugcvsps" Mercurial command allows the builtin
  changeset merging code to be run without doing a conversion. Its
-@@ -10775,7 +10748,7 @@
+@@ -10980,7 +10953,7 @@
  detection.
  .sp
  The following options can be set with \fB\-\-config\fP:
@@ -7896,7 +8128,7 @@
  .TP
  .B convert.svn.branches
  .
-@@ -10797,28 +10770,28 @@
+@@ -11002,28 +10975,28 @@
  use local time (as determined by the TZ
  environment variable) for changeset date/times. The default
  is False (use UTC).
@@ -7930,7 +8162,7 @@
  .TP
  .B convert.git.similarity
  .
-@@ -10826,7 +10799,7 @@
+@@ -11031,7 +11004,7 @@
  commit must be to be imported as renames or copies, as a
  percentage between \fB0\fP (disabled) and \fB100\fP (files must be
  identical). For example, \fB90\fP means that a delete/add pair will
@@ -7939,7 +8171,7 @@
  changed. The default is \fB50\fP.
  .TP
  .B convert.git.findcopiesharder
-@@ -10889,7 +10862,7 @@
+@@ -11094,7 +11067,7 @@
  .
  remote refs are converted as bookmarks with
  \fBconvert.git.remoteprefix\fP as a prefix followed by a /. The default
@@ -7948,7 +8180,7 @@
  .TP
  .B convert.git.saverev
  .
-@@ -10900,7 +10873,7 @@
+@@ -11105,7 +11078,7 @@
  .
  does not convert root level .gitmodules files
  or files with 160000 mode indicating a submodule. Default is False.
@@ -7957,7 +8189,7 @@
  .SS Perforce Source
  .sp
  The Perforce (P4) importer can be given a p4 depot path or a
-@@ -10911,7 +10884,7 @@
+@@ -11116,7 +11089,7 @@
  target may be named \fB...\-hg\fP.
  .sp
  The following options can be set with \fB\-\-config\fP:
@@ -7966,7 +8198,7 @@
  .TP
  .B convert.p4.encoding
  .
-@@ -10923,7 +10896,7 @@
+@@ -11128,7 +11101,7 @@
  .
  specify initial Perforce revision (a
  Perforce changelist number).
@@ -7975,7 +8207,7 @@
  .SS Mercurial Destination
  .sp
  The Mercurial destination will recognize Mercurial subrepositories in the
-@@ -10935,7 +10908,7 @@
+@@ -11140,7 +11113,7 @@
  An example showing how to convert a repository with subrepositories:
  .sp
  .nf
@@ -7984,7 +8216,7 @@
  # so convert knows the type when it sees a non empty destination
  $ hg init converted
  
-@@ -10942,11 +10915,11 @@
+@@ -11147,11 +11120,11 @@
  $ hg convert orig/sub1 converted/sub1
  $ hg convert orig/sub2 converted/sub2
  $ hg convert orig converted
@@ -7998,7 +8230,7 @@
  .TP
  .B convert.hg.clonebranches
  .
-@@ -10965,22 +10938,22 @@
+@@ -11170,22 +11143,22 @@
  .TP
  .B convert.hg.sourcename
  .
@@ -8026,7 +8258,7 @@
  .TP
  .BI \-\-authors \ <FILE>
  .
-@@ -11033,7 +11006,7 @@
+@@ -11238,7 +11211,7 @@
  .B \-\-closesort
  .
  try to reorder closed revisions
@@ -8035,7 +8267,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS eol
-@@ -11047,7 +11020,7 @@
+@@ -11252,7 +11225,7 @@
  .sp
  The extension reads its configuration from a versioned \fB.hgeol\fP
  configuration file found in the root of the working directory. The
@@ -8044,7 +8276,7 @@
  configuration files. It uses two sections, \fB[patterns]\fP and
  \fB[repository]\fP.
  .sp
-@@ -11060,9 +11033,9 @@
+@@ -11265,9 +11238,9 @@
  Files with the declared format of \fBCRLF\fP or \fBLF\fP are always
  checked out and stored in the repository in that format and files
  declared to be binary (\fBBIN\fP) are left unchanged. Additionally,
@@ -8056,7 +8288,7 @@
  default behavior; it is only needed if you need to override a later,
  more general pattern.
  .sp
-@@ -11079,7 +11052,7 @@
+@@ -11284,7 +11257,7 @@
  Example versioned \fB.hgeol\fP file:
  .sp
  .nf
@@ -8065,7 +8297,7 @@
  [patterns]
  **.py = native
  **.vcproj = CRLF
-@@ -11089,7 +11062,7 @@
+@@ -11294,7 +11267,7 @@
  
  [repository]
  native = LF
@@ -8074,7 +8306,7 @@
  .fi
  .IP Note
  .
-@@ -11101,12 +11074,12 @@
+@@ -11306,12 +11279,12 @@
  normal Mercurial configuration files and the \fB.hgeol\fP file, with the
  latter overriding the former. You can use that section to control the
  overall behavior. There are three settings:
@@ -8089,7 +8321,7 @@
  generate an archive where files have line endings for Windows.
  .IP \(bu 2
  .
-@@ -11120,7 +11093,7 @@
+@@ -11325,7 +11298,7 @@
  \fBeol.fix\-trailing\-newline\fP (default False) can be set to True to
  ensure that converted files end with a EOL character (either \fB\en\fP
  or \fB\er\en\fP as per the configured patterns).
@@ -8098,7 +8330,7 @@
  .sp
  The extension provides \fBcleverencode:\fP and \fBcleverdecode:\fP filters
  like the deprecated win32text extension does. This means that you can
-@@ -11136,7 +11109,7 @@
+@@ -11341,7 +11314,7 @@
  \fBeol.checkallhook\fP hook. These hooks are best used as
  \fBpretxnchangegroup\fP hooks.
  .sp
@@ -8107,7 +8339,7 @@
  used.
  .SS extdiff
  .sp
-@@ -11149,12 +11122,12 @@
+@@ -11354,12 +11327,12 @@
  files to compare.
  .sp
  The extdiff extension also allows you to configure new diff commands, so
@@ -8123,7 +8355,7 @@
  cdiff = gdiff \-Nprc5
  ## or the old way:
  #cmd.cdiff = gdiff
-@@ -11170,20 +11143,20 @@
+@@ -11375,20 +11348,20 @@
  # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
  # your .vimrc
  vimdiff = gvim \-f "+next" \e
@@ -8148,7 +8380,7 @@
  .fi
  .sp
  The extdiff extension will look in your [diff\-tools] and [merge\-tools]
-@@ -11190,17 +11163,17 @@
+@@ -11395,17 +11368,17 @@
  sections for diff tool arguments, when none are specified in [extdiff].
  .sp
  .nf
@@ -8170,7 +8402,7 @@
  needed files, so running the external diff program will actually be
  pretty fast (at least faster than having to compare the entire tree).
  .SS Commands
-@@ -11209,9 +11182,9 @@
+@@ -11414,9 +11387,9 @@
  use external program to diff repository (or selected files):
  .sp
  .nf
@@ -8182,7 +8414,7 @@
  .fi
  .sp
  Show differences between revisions for the specified files, using
-@@ -11230,7 +11203,7 @@
+@@ -11435,7 +11408,7 @@
  to its parent.
  .sp
  Options:
@@ -8191,7 +8423,7 @@
  .TP
  .BI \-p,  \-\-program \ <CMD>
  .
-@@ -11263,7 +11236,7 @@
+@@ -11468,7 +11441,7 @@
  .B \-S,  \-\-subrepos
  .
  recurse into subrepositories
@@ -8200,7 +8432,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS factotum
-@@ -11279,9 +11252,9 @@
+@@ -11484,9 +11457,9 @@
  By default, keys are specified as:
  .sp
  .nf
@@ -8212,7 +8444,7 @@
  .fi
  .sp
  If the factotum extension is unable to read the required key, one will be
-@@ -11291,12 +11264,12 @@
+@@ -11496,12 +11469,12 @@
  default, these entries are:
  .sp
  .nf
@@ -8227,7 +8459,7 @@
  .fi
  .sp
  The executable entry defines the full path to the factotum binary. The
-@@ -11311,9 +11284,9 @@
+@@ -11516,9 +11489,9 @@
  pull changes from a remote repository, merge new changes if needed.:
  .sp
  .nf
@@ -8239,7 +8471,7 @@
  .fi
  .sp
  This finds all changes from the repository at the specified path
-@@ -11328,12 +11301,12 @@
+@@ -11533,12 +11506,12 @@
  the newly pulled changes. Local changes are then merged into the
  pulled changes. To switch the merge order, use \-\-switch\-parent.
  .sp
@@ -8254,7 +8486,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV[+]>
  .
-@@ -11378,7 +11351,7 @@
+@@ -11583,7 +11556,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -8263,7 +8495,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS fsmonitor
-@@ -11393,8 +11366,8 @@
+@@ -11598,8 +11571,8 @@
  system, with fsmonitor it takes about 0.3 seconds.
  .sp
  fsmonitor requires no configuration \-\- it will tell Watchman about your
@@ -8274,7 +8506,7 @@
  .sp
  fsmonitor is incompatible with the largefiles and eol extensions, and
  will disable itself if any of those are active.
-@@ -11402,10 +11375,10 @@
+@@ -11607,10 +11580,10 @@
  The following configuration options exist:
  .sp
  .nf
@@ -8287,7 +8519,7 @@
  .fi
  .sp
  When \fImode = off\fP, fsmonitor will disable itself (similar to not loading the
-@@ -11414,10 +11387,10 @@
+@@ -11619,10 +11592,10 @@
  and ensure that the results are consistent.
  .sp
  .nf
@@ -8300,7 +8532,7 @@
  .fi
  .sp
  A value, in seconds, that determines how long fsmonitor will wait for Watchman
-@@ -11424,19 +11397,19 @@
+@@ -11629,19 +11602,19 @@
  to return results. Defaults to \fI2.0\fP.
  .sp
  .nf
@@ -8324,7 +8556,7 @@
  .fi
  .sp
  Whether or not to walk the whole repo ourselves when our cached state has been
-@@ -11448,23 +11421,23 @@
+@@ -11653,23 +11626,23 @@
  from Watchman. Defaults to false.
  .sp
  .nf
@@ -8353,8 +8585,51 @@
 +If \fBwarn_when_unused\fP is set and fsmonitor isn't enabled, a warning will
  be printed during working directory updates if this many files will be
  created.
+ .SS githelp
+@@ -11677,13 +11650,13 @@
+ try mapping git commands to Mercurial commands
+ .sp
+ Tries to map a given git command to a Mercurial command:
+-.INDENT 0.0
+-.INDENT 3.5
++.RS 0
++.RS 3
+ .sp
+ $ hg githelp \-\- git checkout master
+ hg update master
+-.UNINDENT
+-.UNINDENT
++.RE
++.RE
+ .sp
+ If an unknown command or parameter combination is detected, an error is
+ produced.
+@@ -11693,18 +11666,18 @@
+ suggests the Mercurial equivalent of the given git command:
+ .sp
+ .nf
+-.ft C
++.ft
+ hg githelp
+-.ft P
++.ft
+ .fi
+ .sp
+ Usage: hg githelp \-\- <git command>
+-.INDENT 0.0
+-.INDENT 3.5
++.RS 0
++.RS 3
+ .sp
+ aliases: git
+-.UNINDENT
+-.UNINDENT
++.RE
++.RE
  .SS gpg
-@@ -11476,9 +11449,9 @@
+ .sp
+ commands to sign and verify changesets
+@@ -11714,9 +11687,9 @@
  verify all the signatures there may be for a particular revision:
  .sp
  .nf
@@ -8366,7 +8641,7 @@
  .fi
  .sp
  verify all the signatures there may be for a particular revision
-@@ -11487,9 +11460,9 @@
+@@ -11725,9 +11698,9 @@
  add a signature for the current or given revision:
  .sp
  .nf
@@ -8378,7 +8653,7 @@
  .fi
  .sp
  If no revision is given, the parent of the working directory is used,
-@@ -11498,10 +11471,10 @@
+@@ -11736,10 +11709,10 @@
  The \fBgpg.cmd\fP config setting can be used to specify the command
  to run. A default key can be specified with \fBgpg.key\fP.
  .sp
@@ -8391,7 +8666,7 @@
  .TP
  .B \-l,  \-\-local
  .
-@@ -11534,15 +11507,15 @@
+@@ -11772,15 +11745,15 @@
  .BI \-u,  \-\-user \ <USER>
  .
  record the specified user as committer
@@ -8410,7 +8685,7 @@
  .fi
  .sp
  list signed changesets
-@@ -11551,7 +11524,7 @@
+@@ -11789,7 +11762,7 @@
  command to view revision graphs from a shell (DEPRECATED)
  .sp
  The functionality of this extension has been include in core Mercurial
@@ -8419,7 +8694,7 @@
  .sp
  This extension adds a \-\-graph option to the incoming, outgoing and log
  commands. When this options is given, an ASCII representation of the
-@@ -11562,9 +11535,9 @@
+@@ -11800,9 +11773,9 @@
  show revision history alongside an ASCII revision graph:
  .sp
  .nf
@@ -8431,7 +8706,7 @@
  .fi
  .sp
  Print a revision history alongside a revision graph drawn with
-@@ -11573,10 +11546,10 @@
+@@ -11811,10 +11784,10 @@
  Nodes printed as an @ character are parents of the working
  directory.
  .sp
@@ -8444,7 +8719,7 @@
  .TP
  .B \-f,  \-\-follow
  .
-@@ -11665,7 +11638,7 @@
+@@ -11903,7 +11876,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -8453,7 +8728,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS hgk
-@@ -11678,19 +11651,18 @@
+@@ -11916,19 +11889,18 @@
  .sp
  hgk consists of two parts: a Tcl script that does the displaying and
  querying of information, and an extension to Mercurial named hgk.py,
@@ -8480,7 +8755,7 @@
  .fi
  .sp
  hgk can make use of the extdiff extension to visualize revisions.
-@@ -11697,10 +11669,10 @@
+@@ -11935,10 +11907,10 @@
  Assuming you had already configured extdiff vdiff command, just add:
  .sp
  .nf
@@ -8493,7 +8768,7 @@
  .fi
  .sp
  Revisions context menu will now display additional entries to fire
-@@ -11711,36 +11683,36 @@
+@@ -11949,36 +11921,36 @@
  start interactive history viewer:
  .sp
  .nf
@@ -8538,7 +8813,7 @@
  .fi
  .sp
  \fBhighlightonlymatchfilename\fP will only highlight files if their type could
-@@ -11755,7 +11727,7 @@
+@@ -11993,7 +11965,7 @@
  is as follows, assuming the following history:
  .sp
  .nf
@@ -8547,7 +8822,7 @@
  @  3[tip]   7c2fd3b9020c   2009\-04\-27 18:04 \-0500   durin42
  |    Add delta
  |
-@@ -11767,7 +11739,7 @@
+@@ -12005,7 +11977,7 @@
  |
  o  0   d8d2fcd0e319   2009\-04\-27 18:04 \-0500   durin42
       Add alpha
@@ -8556,7 +8831,7 @@
  .fi
  .sp
  If you were to run \fBhg histedit c561b4e977df\fP, you would see the following
-@@ -11774,7 +11746,7 @@
+@@ -12012,7 +11984,7 @@
  file open in your editor:
  .sp
  .nf
@@ -8565,7 +8840,7 @@
  pick c561b4e977df Add beta
  pick 030b686bedc4 Add gamma
  pick 7c2fd3b9020c Add delta
-@@ -11787,12 +11759,12 @@
+@@ -12025,12 +11997,12 @@
  #  p, pick = use commit
  #  e, edit = use commit, but stop for amending
  #  f, fold = use commit, but combine it with the one above
@@ -8580,7 +8855,7 @@
  .fi
  .sp
  In this file, lines beginning with \fB#\fP are ignored. You must specify a rule
-@@ -11801,7 +11773,7 @@
+@@ -12039,7 +12011,7 @@
  would reorganize the file to look like this:
  .sp
  .nf
@@ -8589,7 +8864,7 @@
  pick 030b686bedc4 Add gamma
  pick c561b4e977df Add beta
  fold 7c2fd3b9020c Add delta
-@@ -11814,12 +11786,12 @@
+@@ -12052,12 +12024,12 @@
  #  p, pick = use commit
  #  e, edit = use commit, but stop for amending
  #  f, fold = use commit, but combine it with the one above
@@ -8604,7 +8879,7 @@
  .fi
  .sp
  At which point you close the editor and \fBhistedit\fP starts working. When you
-@@ -11827,21 +11799,21 @@
+@@ -12065,21 +12037,21 @@
  those revisions together, offering you a chance to clean up the commit message:
  .sp
  .nf
@@ -8631,7 +8906,7 @@
  @  2[tip]   989b4d060121   2009\-04\-27 18:04 \-0500   durin42
  |    Add beta and delta.
  |
-@@ -11850,12 +11822,12 @@
+@@ -12088,12 +12060,12 @@
  |
  o  0   d8d2fcd0e319   2009\-04\-27 18:04 \-0500   durin42
       Add alpha
@@ -8646,7 +8921,7 @@
  it had to run strip twice. Strip can be slow depending on a variety of factors,
  so you might need to be a little patient. You can choose to keep the original
  revisions by passing the \fB\-\-keep\fP flag.
-@@ -11862,21 +11834,21 @@
+@@ -12100,21 +12072,21 @@
  .sp
  The \fBedit\fP operation will drop you back to a command prompt,
  allowing you to edit files freely, or even use \fBhg record\fP to commit
@@ -8674,7 +8949,7 @@
  much work it will be to rearrange history, or that you made a mistake,
  you can use \fBhg histedit \-\-abort\fP to abandon the new changes you
  have made and return to the state before you attempted to edit your
-@@ -11886,7 +11858,7 @@
+@@ -12124,7 +12096,7 @@
  changes, such that we have the following history:
  .sp
  .nf
@@ -8683,7 +8958,7 @@
  @  6[tip]   038383181893   2009\-04\-27 18:04 \-0500   stefan
  |    Add theta
  |
-@@ -11907,7 +11879,7 @@
+@@ -12145,7 +12117,7 @@
  |
  o  0   d8d2fcd0e319   2009\-04\-27 18:04 \-0500   durin42
       Add alpha
@@ -8692,7 +8967,7 @@
  .fi
  .sp
  If you run \fBhg histedit \-\-outgoing\fP on the clone then it is the same
-@@ -11921,10 +11893,10 @@
+@@ -12159,10 +12131,10 @@
  configuration file:
  .sp
  .nf
@@ -8705,7 +8980,7 @@
  .fi
  .sp
  \fBhg histedit\fP attempts to automatically choose an appropriate base
-@@ -11932,10 +11904,10 @@
+@@ -12170,10 +12142,10 @@
  revset in your configuration file:
  .sp
  .nf
@@ -8718,7 +8993,7 @@
  .fi
  .sp
  By default each edited revision needs to be present in histedit commands.
-@@ -11943,23 +11915,23 @@
+@@ -12181,23 +12153,23 @@
  the drop to be implicit for missing commits by adding:
  .sp
  .nf
@@ -8747,7 +9022,7 @@
  .fi
  .SS Commands
  .SS histedit
-@@ -11967,15 +11939,15 @@
+@@ -12205,15 +12177,15 @@
  interactively edit changeset history:
  .sp
  .nf
@@ -8766,7 +9041,7 @@
  .IP \(bu 2
  .
  \fIpick\fP to [re]order a changeset
-@@ -11990,7 +11962,7 @@
+@@ -12228,7 +12200,7 @@
  \fIfold\fP to combine it with the preceding changeset (using the later date)
  .IP \(bu 2
  .
@@ -8775,7 +9050,7 @@
  .IP \(bu 2
  .
  \fIedit\fP to edit this changeset (preserving date)
-@@ -11997,10 +11969,10 @@
+@@ -12235,10 +12207,10 @@
  .IP \(bu 2
  .
  \fIbase\fP to checkout changeset and apply further changesets from there
@@ -8788,7 +9063,7 @@
  .IP \(bu 2
  .
  Specify ANCESTOR directly
-@@ -12007,7 +11979,7 @@
+@@ -12245,7 +12217,7 @@
  .IP \(bu 2
  .
  Use \-\-outgoing \-\- it will be the first linear changeset not
@@ -8797,7 +9072,7 @@
  .IP \(bu 2
  .
  Otherwise, the value from the "histedit.defaultrev" config option
-@@ -12015,7 +11987,7 @@
+@@ -12253,7 +12225,7 @@
  specified. The first revision returned by the revset is used. By
  default, this selects the editable history that is unique to the
  ancestry of the working directory.
@@ -8806,7 +9081,7 @@
  .sp
  If you use \-\-outgoing, this command will abort if there are ambiguous
  outgoing revisions. For example, if there are multiple branches
-@@ -12023,13 +11995,13 @@
+@@ -12261,13 +12233,13 @@
  .sp
  Use "min(outgoing() and ::.)" or similar revset specification
  instead of \-\-outgoing to specify edit target revision exactly in
@@ -8824,7 +9099,7 @@
  .IP \(bu 2
  .
  A number of changes have been made.
-@@ -12038,9 +12010,9 @@
+@@ -12276,9 +12248,9 @@
  Start history editing from revision 3:
  .sp
  .nf
@@ -8836,7 +9111,7 @@
  .fi
  .sp
  An editor opens, containing the list of revisions,
-@@ -12047,11 +12019,11 @@
+@@ -12285,11 +12257,11 @@
  with specific actions specified:
  .sp
  .nf
@@ -8850,7 +9125,7 @@
  .fi
  .sp
  Additional information about the possible actions
-@@ -12059,14 +12031,14 @@
+@@ -12297,14 +12269,14 @@
  .sp
  To remove revision 3 from the history,
  its action (at the beginning of the relevant line)
@@ -8868,7 +9143,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -12076,9 +12048,9 @@
+@@ -12314,9 +12286,9 @@
  Start history editing from revision 2:
  .sp
  .nf
@@ -8880,7 +9155,7 @@
  .fi
  .sp
  An editor opens, containing the list of revisions,
-@@ -12085,11 +12057,11 @@
+@@ -12323,11 +12295,11 @@
  with specific actions specified:
  .sp
  .nf
@@ -8894,7 +9169,7 @@
  .fi
  .sp
  To swap revision 2 and 4, its lines are swapped
-@@ -12096,15 +12068,15 @@
+@@ -12334,15 +12306,15 @@
  in the editor:
  .sp
  .nf
@@ -8915,7 +9190,7 @@
  .sp
  Returns 0 on success, 1 if user intervention is required (not only
  for intentional "edit" command, but also for resolving unexpected
-@@ -12111,7 +12083,7 @@
+@@ -12349,7 +12321,7 @@
  conflicts).
  .sp
  Options:
@@ -8924,7 +9199,7 @@
  .TP
  .BI \-\-commands \ <FILE>
  .
-@@ -12127,7 +12099,7 @@
+@@ -12365,7 +12337,7 @@
  .TP
  .B \-k,  \-\-keep
  .
@@ -8933,16 +9208,16 @@
  .TP
  .B \-\-abort
  .
-@@ -12144,7 +12116,7 @@
- .BI \-r,  \-\-rev \ <REV[+]>
+@@ -12386,7 +12358,7 @@
+ .BI \-T,  \-\-template \ <TEMPLATE>
  .
- first revision to be edited
+ display with template (EXPERIMENTAL)
 -.UNINDENT
 +.RE
  .sp
  [+] marked option can be specified multiple times
  .SS journal
-@@ -12159,9 +12131,9 @@
+@@ -12401,9 +12373,9 @@
  show the previous position of bookmarks and the working copy:
  .sp
  .nf
@@ -8954,7 +9229,7 @@
  .fi
  .sp
  The journal is used to see the previous commits that bookmarks and the
-@@ -12169,7 +12141,7 @@
+@@ -12411,7 +12383,7 @@
  copy.  Passing a bookmark name will show all the previous positions of
  that bookmark. Use the \-\-all switch to show previous locations for all
  bookmarks and the working copy; each line will then include the bookmark
@@ -8963,7 +9238,7 @@
  .sp
  If \fIname\fP starts with \fIre:\fP, the remainder of the name is treated as
  a regular expression. To match a name that actually starts with \fIre:\fP,
-@@ -12186,7 +12158,7 @@
+@@ -12428,7 +12400,7 @@
  \fIhg journal \-T json\fP can be used to produce machine readable output.
  .sp
  Options:
@@ -8972,7 +9247,7 @@
  .TP
  .B \-\-all
  .
-@@ -12219,7 +12191,7 @@
+@@ -12461,7 +12433,7 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template
@@ -8981,7 +9256,7 @@
  .SS keyword
  .sp
  expand keywords in tracked files
-@@ -12240,7 +12212,7 @@
+@@ -12482,7 +12454,7 @@
  Example:
  .sp
  .nf
@@ -8990,7 +9265,7 @@
  [keyword]
  # expand keywords in every python file except those matching "x*"
  **.py =
-@@ -12249,7 +12221,7 @@
+@@ -12491,7 +12463,7 @@
  [keywordset]
  # prefer svn\- over cvs\-like default keywordmaps
  svn = True
@@ -8999,7 +9274,7 @@
  .fi
  .IP Note
  .
-@@ -12258,11 +12230,11 @@
+@@ -12500,11 +12472,11 @@
  .RE
  .sp
  For [keywordmaps] template mapping and expansion demonstration and
@@ -9013,7 +9288,7 @@
  .TP
  .B \fButcdate\fP
  .sp
-@@ -12275,20 +12247,20 @@
+@@ -12517,20 +12489,20 @@
  .B \fBsvnisodate\fP
  .sp
  "2006\-09\-18 08:13:13 \-700 (Mon, 18 Sep 2006)"
@@ -9040,7 +9315,7 @@
  {desc}" expands to the first line of the changeset description.
  .SS Commands
  .SS kwdemo
-@@ -12296,9 +12268,9 @@
+@@ -12538,9 +12510,9 @@
  print [keywordmaps] configuration and an expansion example:
  .sp
  .nf
@@ -9052,7 +9327,7 @@
  .fi
  .sp
  Show current, custom, or default keyword template maps and their
-@@ -12309,10 +12281,10 @@
+@@ -12551,10 +12523,10 @@
  .sp
  Use \-d/\-\-default to disable current configuration.
  .sp
@@ -9065,7 +9340,7 @@
  .TP
  .B \-d,  \-\-default
  .
-@@ -12321,15 +12293,15 @@
+@@ -12563,15 +12535,15 @@
  .BI \-f,  \-\-rcfile \ <FILE>
  .
  read maps from rcfile
@@ -9084,7 +9359,7 @@
  .fi
  .sp
  Run after (re)enabling keyword expansion.
-@@ -12337,7 +12309,7 @@
+@@ -12579,7 +12551,7 @@
  kwexpand refuses to run if given files contain local changes.
  .sp
  Options:
@@ -9093,7 +9368,7 @@
  .TP
  .BI \-I,  \-\-include \ <PATTERN[+]>
  .
-@@ -12346,7 +12318,7 @@
+@@ -12588,7 +12560,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -9102,7 +9377,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS kwfiles
-@@ -12354,9 +12326,9 @@
+@@ -12596,9 +12568,9 @@
  show files configured for keyword expansion:
  .sp
  .nf
@@ -9114,7 +9389,7 @@
  .fi
  .sp
  List which files in the working directory are matched by the
-@@ -12366,7 +12338,7 @@
+@@ -12608,7 +12580,7 @@
  execution by including only files that are actual candidates for
  expansion.
  .sp
@@ -9123,7 +9398,7 @@
  inclusion and exclusion of files.
  .sp
  With \-A/\-\-all and \-v/\-\-verbose the codes used to show the status
-@@ -12373,16 +12345,16 @@
+@@ -12615,16 +12587,16 @@
  of files are:
  .sp
  .nf
@@ -9143,7 +9418,7 @@
  .TP
  .B \-A,  \-\-all
  .
-@@ -12403,7 +12375,7 @@
+@@ -12645,7 +12617,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -9152,7 +9427,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS kwshrink
-@@ -12411,9 +12383,9 @@
+@@ -12653,9 +12625,9 @@
  revert expanded keywords in the working directory:
  .sp
  .nf
@@ -9164,7 +9439,7 @@
  .fi
  .sp
  Must be run before changing/disabling active keywords.
-@@ -12421,7 +12393,7 @@
+@@ -12663,7 +12635,7 @@
  kwshrink refuses to run if given files contain local changes.
  .sp
  Options:
@@ -9173,7 +9448,7 @@
  .TP
  .BI \-I,  \-\-include \ <PATTERN[+]>
  .
-@@ -12430,7 +12402,7 @@
+@@ -12672,7 +12644,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -9182,7 +9457,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS largefiles
-@@ -12439,10 +12411,10 @@
+@@ -12681,10 +12653,10 @@
  .sp
  Large binary files tend to be not very compressible, not very
  diffable, and not at all mergeable. Such files are not handled
@@ -9195,7 +9470,7 @@
  problems by adding a centralized client\-server layer on top of
  Mercurial: largefiles live in a \fIcentral store\fP out on the network
  somewhere, and you only fetch the revisions that you need when you
-@@ -12454,18 +12426,18 @@
+@@ -12696,18 +12668,18 @@
  identified by the SHA\-1 hash of their contents, which is written to
  the standin. largefiles uses that revision ID to get/put largefile
  revisions from/to the central store. This saves both disk space and
@@ -9218,7 +9493,7 @@
  .fi
  .sp
  When you push a changeset that adds/modifies largefiles to a remote
-@@ -12482,8 +12454,8 @@
+@@ -12724,8 +12696,8 @@
  copy to the latest pulled revision (and thereby downloading any new
  largefiles).
  .sp
@@ -9229,7 +9504,7 @@
  .sp
  If you know you are pulling from a non\-default location and want to
  download all the largefiles that correspond to the new changesets at
-@@ -12502,12 +12474,12 @@
+@@ -12744,12 +12716,12 @@
  If you already have large files tracked by Mercurial without the
  largefiles extension, you will need to convert your repository in
  order to benefit from largefiles. This is done with the
@@ -9245,7 +9520,7 @@
  .fi
  .sp
  In repositories that already have largefiles in them, any new file
-@@ -12517,20 +12489,20 @@
+@@ -12759,20 +12731,20 @@
  \-\-lfsize option to the add command (also in megabytes):
  .sp
  .nf
@@ -9270,7 +9545,7 @@
  [largefiles]
  patterns =
    *.jpg
-@@ -12537,7 +12509,7 @@
+@@ -12779,7 +12751,7 @@
    re:.*\e.(png|bmp)$
    library.zip
    content/audio/*
@@ -9279,7 +9554,7 @@
  .fi
  .sp
  Files that match one of these patterns will be added as largefiles
-@@ -12546,7 +12518,7 @@
+@@ -12788,7 +12760,7 @@
  The \fBlargefiles.minsize\fP and \fBlargefiles.patterns\fP config options
  will be ignored for any repositories not already containing a
  largefile. To add the first largefile to a repository, you must
@@ -9288,7 +9563,7 @@
  command.
  .SS Commands
  .SS lfconvert
-@@ -12554,9 +12526,9 @@
+@@ -12796,9 +12768,9 @@
  convert a normal repository to a largefiles repository:
  .sp
  .nf
@@ -9300,7 +9575,7 @@
  .fi
  .sp
  Convert repository SOURCE to a new repository DEST, identical to
-@@ -12576,7 +12548,7 @@
+@@ -12818,7 +12790,7 @@
  this, the DEST repository can be used without largefiles at all.
  .sp
  Options:
@@ -9309,7 +9584,7 @@
  .TP
  .BI \-s,  \-\-size \ <SIZE>
  .
-@@ -12585,33 +12557,33 @@
+@@ -12827,33 +12799,33 @@
  .B \-\-to\-normal
  .
  convert from a largefiles repo to a normal repo
@@ -9351,7 +9626,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -12618,14 +12590,14 @@
+@@ -12860,14 +12832,14 @@
  pull largefiles on the default branch:
  .sp
  .nf
@@ -9370,7 +9645,7 @@
  .TP
  .BI \-r,  \-\-rev \ <VALUE[+]>
  .
-@@ -12642,7 +12614,7 @@
+@@ -12884,7 +12856,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -9378,8 +9653,78 @@
 +.RE
  .sp
  [+] marked option can be specified multiple times
+ .SS lfs
+@@ -12901,7 +12873,7 @@
+ The files stored outside of the repository are downloaded on demand,
+ which reduces the time to clone, and possibly the local disk usage.
+ This changes fundamental workflows in a DVCS, so careful thought
+-should be given before deploying it.  \%\fBhg convert\fP\: can be used to
++should be given before deploying it.  \fBhg convert\fP can be used to
+ convert LFS repositories to normal repositories that no longer
+ require this extension, and do so without changing the commit hashes.
+ This allows the extension to be disabled if the centralized workflow
+@@ -12920,7 +12892,7 @@
+ between LFS and normal storage, as needed.
+ .sp
+ Alternately, both normal repositories and largefile controlled
+-repositories can be converted to LFS by using \%\fBhg convert\fP\: and the
++repositories can be converted to LFS by using \fBhg convert\fP and the
+ \fBlfs.track\fP config option described below.  The \fB.hglfs\fP file
+ should then be created and added, to control subsequent LFS selection.
+ The hashes are also unchanged in this case.  The LFS and non\-LFS
+@@ -12931,7 +12903,7 @@
+ Prior to pushing the normal repository data, the LFS files that are
+ tracked by the outgoing commits are automatically uploaded to the
+ configured central server.  No LFS files are transferred on
+-\%\fBhg pull\fP\: or \%\fBhg clone\fP\:.  Instead, the files are downloaded on
++\fBhg pull\fP or \fBhg clone\fP.  Instead, the files are downloaded on
+ demand as they need to be read, if a cached copy cannot be found
+ locally.  Both committing and downloading an LFS file will link the
+ file to a usercache, to speed up future access.  See the \fIusercache\fP
+@@ -12940,7 +12912,7 @@
+ .hglfs:
+ .sp
+ .nf
+-.ft C
++.ft
+ The extension reads its configuration from a versioned \(ga\(ga.hglfs\(ga\(ga
+ configuration file found in the root of the working directory. The
+ \(ga\(ga.hglfs\(ga\(ga file uses the same syntax as all other Mercurial
+@@ -12964,13 +12936,13 @@
+ 
+   # Catchall for everything not matched above
+   ** = size(">10MB")
+-.ft P
++.ft
+ .fi
+ .sp
+ Configs:
+ .sp
+ .nf
+-.ft C
++.ft
+ [lfs]
+ # Remote endpoint. Multiple protocols are supported:
+ # \- http(s)://user:pass@example.com/path
+@@ -12998,7 +12970,7 @@
+ #     | (path:bin & !path:/bin/README) | size(">1GB")
+ # (default: none())
+ #
+-# This is ignored if there is a tracked \(aq.hglfs\(aq file, and this setting
++# This is ignored if there is a tracked '.hglfs' file, and this setting
+ # will eventually be deprecated and removed.
+ track = size(">10M")
+ 
+@@ -13008,7 +12980,7 @@
+ # the local directory to store lfs files for sharing across local clones.
+ # If not set, the cache is located in an OS specific cache location.
+ usercache = /path/to/global/cache
+-.ft P
++.ft
+ .fi
+ .SS Commands
  .SS logtoprocess
-@@ -12658,7 +12630,7 @@
+@@ -13024,7 +12996,7 @@
  prefixed with \fIOPT_\fP). The original event name is passed in the \fIEVENT\fP
  environment variable, and the process ID of mercurial is given in \fIHGPID\fP.
  .sp
@@ -9388,7 +9733,7 @@
  for the \(gafoo\fP event can expect an environment with \fIMSG1=bar\fP, \fIMSG2=baz\fP, and
  \fIOPT_SPAM=eggs\fP.
  .sp
-@@ -12666,10 +12638,10 @@
+@@ -13032,10 +13004,10 @@
  For example:
  .sp
  .nf
@@ -9401,7 +9746,7 @@
  .fi
  .sp
  would log the warning message and traceback of any failed command dispatch.
-@@ -12687,10 +12659,10 @@
+@@ -13053,10 +13025,10 @@
  Known patches are represented as patch files in the .hg/patches
  directory. Applied patches are both patch files and changesets.
  .sp
@@ -9414,7 +9759,7 @@
  create new patch                          qnew
  import existing patch                     qimport
  
-@@ -12700,7 +12672,7 @@
+@@ -13066,7 +13038,7 @@
  add known patch to applied stack          qpush
  remove patch from applied stack           qpop
  refresh contents of top applied patch     qrefresh
@@ -9423,7 +9768,7 @@
  .fi
  .sp
  By default, mq will automatically use git patches when required to
-@@ -12708,29 +12680,29 @@
+@@ -13074,29 +13046,29 @@
  files creations or deletions. This behavior can be configured with:
  .sp
  .nf
@@ -9462,7 +9807,7 @@
  .sp
  If the working directory contains uncommitted files, qpush, qpop and
  qgoto abort immediately. If \-f/\-\-force is used, the changes are
-@@ -12737,10 +12709,10 @@
+@@ -13103,10 +13075,10 @@
  discarded. Setting:
  .sp
  .nf
@@ -9475,7 +9820,7 @@
  .fi
  .sp
  make them behave as if \-\-keep\-changes were passed, and non\-conflicting
-@@ -12755,15 +12727,15 @@
+@@ -13121,15 +13093,15 @@
  print the patches already applied:
  .sp
  .nf
@@ -9494,7 +9839,7 @@
  .TP
  .B \-1,  \-\-last
  .
-@@ -12772,15 +12744,15 @@
+@@ -13138,15 +13110,15 @@
  .B \-s,  \-\-summary
  .
  print first line of patch header
@@ -9513,7 +9858,7 @@
  .fi
  .sp
  If source is local, destination will have no patches applied. If
-@@ -12793,12 +12765,12 @@
+@@ -13159,12 +13131,12 @@
  default. Use \-p <url> to change.
  .sp
  The patch directory must be a nested Mercurial repository, as
@@ -9528,7 +9873,7 @@
  .TP
  .B \-\-pull
  .
-@@ -12827,21 +12799,21 @@
+@@ -13193,21 +13165,21 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -9555,7 +9900,7 @@
  .TP
  .B \-A,  \-\-addremove
  .
-@@ -12894,23 +12866,23 @@
+@@ -13260,23 +13232,23 @@
  .B \-S,  \-\-subrepos
  .
  recurse into subrepositories
@@ -9586,7 +9931,7 @@
  .fi
  .sp
  The patches must not be applied, and at least one patch is required. Exact
-@@ -12918,10 +12890,10 @@
+@@ -13284,10 +13256,10 @@
  preserved in the patch directory.
  .sp
  To stop managing a patch and move it into permanent history,
@@ -9599,7 +9944,7 @@
  .TP
  .B \-k,  \-\-keep
  .
-@@ -12930,23 +12902,23 @@
+@@ -13296,23 +13268,23 @@
  .BI \-r,  \-\-rev \ <REV[+]>
  .
  stop managing a revision (DEPRECATED)
@@ -9630,7 +9975,7 @@
  .fi
  .sp
  Shows a diff which includes the current patch as well as any
-@@ -12954,8 +12926,8 @@
+@@ -13320,8 +13292,8 @@
  last refresh (thus showing what the current patch would become
  after a qrefresh).
  .sp
@@ -9641,7 +9986,7 @@
  made by the current patch without including changes made since the
  qrefresh.
  .sp
-@@ -12962,7 +12934,7 @@
+@@ -13328,7 +13300,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -9650,7 +9995,7 @@
  .TP
  .B \-a,  \-\-text
  .
-@@ -13027,7 +12999,7 @@
+@@ -13393,7 +13365,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -9659,7 +10004,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS qfinish
-@@ -13035,9 +13007,9 @@
+@@ -13401,9 +13373,9 @@
  move applied patches into repository history:
  .sp
  .nf
@@ -9671,7 +10016,7 @@
  .fi
  .sp
  Finishes the specified revisions (corresponding to applied
-@@ -13056,20 +13028,20 @@
+@@ -13422,20 +13394,20 @@
  Returns 0 on success.
  .sp
  Options:
@@ -9696,7 +10041,7 @@
  .fi
  .sp
  Patches must not yet be applied. Each patch will be successively
-@@ -13085,7 +13057,7 @@
+@@ -13451,7 +13423,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -9705,7 +10050,7 @@
  .TP
  .B \-e,  \-\-edit
  .
-@@ -13102,21 +13074,21 @@
+@@ -13468,21 +13440,21 @@
  .BI \-l,  \-\-logfile \ <FILE>
  .
  read commit message from file
@@ -9731,7 +10076,7 @@
  .TP
  .B \-\-keep\-changes
  .
-@@ -13129,21 +13101,21 @@
+@@ -13495,21 +13467,21 @@
  .B \-\-no\-backup
  .
  do not save backup copies of files
@@ -9758,7 +10103,7 @@
  has activated it.
  .sp
  With no arguments, print the currently active guards.
-@@ -13150,21 +13122,21 @@
+@@ -13516,21 +13488,21 @@
  With arguments, set guards for the named patch.
  .IP Note
  .
@@ -9784,7 +10129,7 @@
  .TP
  .B \-l,  \-\-list
  .
-@@ -13173,15 +13145,15 @@
+@@ -13539,15 +13511,15 @@
  .B \-n,  \-\-none
  .
  drop all guards
@@ -9803,7 +10148,7 @@
  .fi
  .sp
  Returns 0 on success.
-@@ -13190,9 +13162,9 @@
+@@ -13556,9 +13528,9 @@
  import a patch or existing changeset:
  .sp
  .nf
@@ -9815,7 +10160,7 @@
  .fi
  .sp
  The patch is inserted into the series after the last applied
-@@ -13213,7 +13185,7 @@
+@@ -13579,7 +13551,7 @@
  under mq control). With \-g/\-\-git, patches imported with \-\-rev will
  use the git diff format. See the diffs help topic for information
  on why this is important for preserving rename/copy information
@@ -9824,7 +10169,7 @@
  from mq control.
  .sp
  To import a patch from standard input, pass \- as the patch file.
-@@ -13223,15 +13195,15 @@
+@@ -13589,15 +13561,15 @@
  To import an existing patch while renaming it:
  .sp
  .nf
@@ -9843,7 +10188,7 @@
  .TP
  .B \-e,  \-\-existing
  .
-@@ -13256,7 +13228,7 @@
+@@ -13622,7 +13594,7 @@
  .B \-P,  \-\-push
  .
  qpush after importing
@@ -9852,7 +10197,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS qinit
-@@ -13264,9 +13236,9 @@
+@@ -13630,9 +13602,9 @@
  init a new queue repository (DEPRECATED):
  .sp
  .nf
@@ -9864,7 +10209,7 @@
  .fi
  .sp
  The queue repository is unversioned by default. If
-@@ -13275,24 +13247,24 @@
+@@ -13641,24 +13613,24 @@
  an unversioned patch repository into a versioned one). You can use
  qcommit to commit changes to this queue repository.
  .sp
@@ -9895,7 +10240,7 @@
  .fi
  .sp
  qnew creates a new patch on top of the currently\-applied patch (if
-@@ -13308,7 +13280,7 @@
+@@ -13674,7 +13646,7 @@
  .sp
  \-e/\-\-edit, \-m/\-\-message or \-l/\-\-logfile set the patch header as
  well as the commit message. If none is specified, the header is
@@ -9904,7 +10249,7 @@
  .sp
  Use the \-g/\-\-git option to keep the patch in the git extended diff
  format. Read the diffs help topic for more information on why this
-@@ -13318,7 +13290,7 @@
+@@ -13684,7 +13656,7 @@
  Returns 0 on successful creation of a new patch.
  .sp
  Options:
@@ -9913,7 +10258,7 @@
  .TP
  .B \-e,  \-\-edit
  .
-@@ -13363,7 +13335,7 @@
+@@ -13729,7 +13701,7 @@
  .BI \-l,  \-\-logfile \ <FILE>
  .
  read commit message from file
@@ -9922,7 +10267,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS qnext
-@@ -13371,28 +13343,28 @@
+@@ -13737,28 +13709,28 @@
  print the name of the next pushable patch:
  .sp
  .nf
@@ -9957,7 +10302,7 @@
  .fi
  .sp
  Without argument, pops off the top of the patch stack. If given a
-@@ -13407,7 +13379,7 @@
+@@ -13773,7 +13745,7 @@
  Return 0 on success.
  .sp
  Options:
@@ -9966,7 +10311,7 @@
  .TP
  .B \-a,  \-\-all
  .
-@@ -13428,34 +13400,34 @@
+@@ -13794,34 +13766,34 @@
  .B \-\-no\-backup
  .
  do not save backup copies of files
@@ -10008,7 +10353,7 @@
  .fi
  .sp
  By default, abort if the working directory contains uncommitted
-@@ -13466,7 +13438,7 @@
+@@ -13832,7 +13804,7 @@
  Return 0 on success.
  .sp
  Options:
@@ -10017,7 +10362,7 @@
  .TP
  .B \-\-keep\-changes
  .
-@@ -13503,15 +13475,15 @@
+@@ -13869,15 +13841,15 @@
  .B \-\-no\-backup
  .
  do not save backup copies of files
@@ -10036,7 +10381,7 @@
  .fi
  .sp
  Supports switching between different patch queues, as well as creating
-@@ -13533,7 +13505,7 @@
+@@ -13899,7 +13871,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -10045,7 +10390,7 @@
  .TP
  .B \-l,  \-\-list
  .
-@@ -13558,15 +13530,15 @@
+@@ -13924,15 +13896,15 @@
  .B \-\-purge
  .
  delete queue, and remove patch dir
@@ -10064,7 +10409,7 @@
  .fi
  .sp
  If any file patterns are provided, the refreshed patch will
-@@ -13588,7 +13560,7 @@
+@@ -13954,7 +13926,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -10073,7 +10418,7 @@
  .TP
  .B \-e,  \-\-edit
  .
-@@ -13633,7 +13605,7 @@
+@@ -13999,7 +13971,7 @@
  .BI \-l,  \-\-logfile \ <FILE>
  .
  read commit message from file
@@ -10082,7 +10427,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS qrename
-@@ -13641,9 +13613,9 @@
+@@ -14007,9 +13979,9 @@
  rename a patch:
  .sp
  .nf
@@ -10094,7 +10439,7 @@
  .fi
  .sp
  With one argument, renames the current patch to PATCH1.
-@@ -13650,26 +13622,26 @@
+@@ -14016,26 +13988,26 @@
  With two arguments, renames PATCH1 to PATCH2.
  .sp
  Returns 0 on success.
@@ -10129,7 +10474,7 @@
  .TP
  .B \-d,  \-\-delete
  .
-@@ -13678,21 +13650,21 @@
+@@ -14044,21 +14016,21 @@
  .B \-u,  \-\-update
  .
  update queue working directory
@@ -10156,7 +10501,7 @@
  .TP
  .B \-c,  \-\-copy
  .
-@@ -13717,18 +13689,18 @@
+@@ -14083,18 +14055,18 @@
  .BI \-l,  \-\-logfile \ <FILE>
  .
  read commit message from file
@@ -10179,7 +10524,7 @@
  qselect to tell mq which guards to use. A patch will be pushed if
  it has no guards or any positive guards match the currently
  selected guard, but will not be pushed if any negative guards
-@@ -13735,11 +13707,11 @@
+@@ -14101,11 +14073,11 @@
  match the current guard. For example:
  .sp
  .nf
@@ -10193,7 +10538,7 @@
  .fi
  .sp
  This activates the "stable" guard. mq will skip foo.patch (because
-@@ -13765,7 +13737,7 @@
+@@ -14131,7 +14103,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -10202,7 +10547,7 @@
  .TP
  .B \-n,  \-\-none
  .
-@@ -13782,21 +13754,21 @@
+@@ -14148,21 +14120,21 @@
  .B \-\-reapply
  .
  pop, then reapply patches
@@ -10228,7 +10573,7 @@
  .TP
  .B \-m,  \-\-missing
  .
-@@ -13805,40 +13777,40 @@
+@@ -14171,40 +14143,40 @@
  .B \-s,  \-\-summary
  .
  print first line of patch header
@@ -10277,7 +10622,7 @@
  .TP
  .B \-1,  \-\-first
  .
-@@ -13847,7 +13819,7 @@
+@@ -14213,7 +14185,7 @@
  .B \-s,  \-\-summary
  .
  print first line of patch header
@@ -10286,7 +10631,7 @@
  .SS notify
  .sp
  hooks for sending email push notifications
-@@ -13855,13 +13827,13 @@
+@@ -14221,13 +14193,13 @@
  This extension implements hooks to send email notifications when
  changesets are sent from or received by the local repository.
  .sp
@@ -10302,7 +10647,7 @@
  [hooks]
  # one email for each incoming changeset
  incoming.notify = python:hgext.notify.hook
-@@ -13870,7 +13842,7 @@
+@@ -14236,7 +14208,7 @@
  
  # one email for all outgoing changesets
  outgoing.notify = python:hgext.notify.hook
@@ -10311,7 +10656,7 @@
  .fi
  .sp
  This registers the hooks. To enable notification, subscribers must
-@@ -13879,7 +13851,7 @@
+@@ -14245,7 +14217,7 @@
  multiple recipients to a single repository:
  .sp
  .nf
@@ -10320,7 +10665,7 @@
  [usersubs]
  # key is subscriber email, value is a comma\-separated list of repo patterns
  user@host = pattern
-@@ -13887,7 +13859,7 @@
+@@ -14253,7 +14225,7 @@
  [reposubs]
  # key is repo pattern, value is a comma\-separated list of subscriber emails
  pattern = user@host
@@ -10329,7 +10674,7 @@
  .fi
  .sp
  A \fBpattern\fP is a \fBglob\fP matching the absolute path to a repository,
-@@ -13895,10 +13867,10 @@
+@@ -14261,10 +14233,10 @@
  present, is separated from the glob by a hash. Example:
  .sp
  .nf
@@ -10342,7 +10687,7 @@
  .fi
  .sp
  This sends to \fBqa\-team@example.com\fP whenever a changeset on the \fBrelease\fP
-@@ -13909,10 +13881,10 @@
+@@ -14275,10 +14247,10 @@
  incorporated by reference:
  .sp
  .nf
@@ -10355,7 +10700,7 @@
  .fi
  .sp
  Notifications will not be sent until the \fBnotify.test\fP value is set
-@@ -13919,7 +13891,7 @@
+@@ -14285,7 +14257,7 @@
  to \fBFalse\fP; see below.
  .sp
  Notifications content can be tweaked with the following configuration entries:
@@ -10364,7 +10709,7 @@
  .TP
  .B notify.test
  .
-@@ -13928,8 +13900,8 @@
+@@ -14294,8 +14266,8 @@
  .B notify.sources
  .
  Space\-separated list of change sources. Notifications are activated only
@@ -10375,7 +10720,7 @@
  .TP
  .B \fBserve\fP
  .sp
-@@ -13950,7 +13922,7 @@
+@@ -14316,7 +14288,7 @@
  .B \fBbundle\fP
  .sp
  changesets sent via \fBhg unbundle\fP
@@ -10384,7 +10729,7 @@
  .sp
  Default: serve.
  .TP
-@@ -13993,7 +13965,7 @@
+@@ -14359,7 +14331,7 @@
  .TP
  .B notify.maxsubject
  .
@@ -10393,7 +10738,7 @@
  .TP
  .B notify.diffstat
  .
-@@ -14012,11 +13984,11 @@
+@@ -14378,11 +14350,11 @@
  If set, use the committer of the first changeset in a changegroup for
  the "From" field of the notification mail. If not set, take the user
  from the pushing repo.  Default: False.
@@ -10407,7 +10752,7 @@
  .TP
  .B email.from
  .
-@@ -14027,20 +13999,20 @@
+@@ -14393,20 +14365,20 @@
  .
  Root repository URL to combine with repository paths when making
  references. See also \fBnotify.strip\fP.
@@ -10432,7 +10777,7 @@
  .fi
  .SS patchbomb
  .sp
-@@ -14052,7 +14024,7 @@
+@@ -14418,7 +14390,7 @@
  Each patch email has a Subject line of "[PATCH M of N] ...", using the
  first line of the changeset description as the subject text. The
  message contains two or three body parts:
@@ -10441,7 +10786,7 @@
  .IP \(bu 2
  .
  The changeset description.
-@@ -14061,8 +14033,8 @@
+@@ -14427,8 +14399,8 @@
  [Optional] The result of running diffstat on the patch.
  .IP \(bu 2
  .
@@ -10452,7 +10797,7 @@
  .sp
  Each message refers to the first in the series using the In\-Reply\-To
  and References headers, so they will show up as a sequence in threaded
-@@ -14072,7 +14044,7 @@
+@@ -14438,7 +14410,7 @@
  configuration file:
  .sp
  .nf
@@ -10461,7 +10806,7 @@
  [email]
  from = My Name <my@email>
  to = recipient1, recipient2, ...
-@@ -14079,13 +14051,13 @@
+@@ -14445,13 +14417,13 @@
  cc = cc1, cc2, ...
  bcc = bcc1, bcc2, ...
  reply\-to = address1, address2, ...
@@ -10477,7 +10822,7 @@
  changesets as a patchbomb.
  .sp
  You can also either configure the method option in the email section
-@@ -14094,15 +14066,15 @@
+@@ -14460,15 +14432,15 @@
  directly from the commandline. See the [email] and [smtp] sections in
  hgrc(5) for details.
  .sp
@@ -10496,7 +10841,7 @@
  .fi
  .sp
  You can control the default inclusion of an introduction message with the
-@@ -14110,12 +14082,12 @@
+@@ -14476,12 +14448,12 @@
  overwritten by command line flags like \-\-intro and \-\-desc:
  .sp
  .nf
@@ -10511,7 +10856,7 @@
  .fi
  .sp
  You can specify a template for flags to be added in subject prefixes. Flags
-@@ -14122,12 +14094,12 @@
+@@ -14488,12 +14460,12 @@
  specified by \-\-flag option are exported as \fB{flags}\fP keyword:
  .sp
  .nf
@@ -10528,7 +10873,7 @@
  .fi
  .sp
  You can set patchbomb to always ask for confirmation by setting
-@@ -14138,13 +14110,13 @@
+@@ -14504,13 +14476,13 @@
  send changesets by email:
  .sp
  .nf
@@ -10545,7 +10890,7 @@
  of N]" introduction, which describes the series as a whole.
  .sp
  Each patch email has a Subject line of "[PATCH M of N] ...", using
-@@ -14155,7 +14127,7 @@
+@@ -14521,7 +14493,7 @@
  With the \-d/\-\-diffstat option, if the diffstat program is
  installed, the result of running diffstat on the patch is inserted.
  .sp
@@ -10554,7 +10899,7 @@
  .sp
  With the \-d/\-\-diffstat or \-\-confirm options, you will be presented
  with a final summary of all messages and asked for confirmation before
-@@ -14178,7 +14150,7 @@
+@@ -14544,7 +14516,7 @@
  With \-b/\-\-bundle, changesets are selected as for \-\-outgoing, but a
  single email containing a binary Mercurial bundle as an attachment
  will be sent. Use the \fBpatchbomb.bundletype\fP config option to
@@ -10563,7 +10908,7 @@
  .sp
  With \-m/\-\-mbox, instead of previewing each patchbomb message in a
  pager or sending the messages directly, it will create a UNIX
-@@ -14195,12 +14167,12 @@
+@@ -14561,12 +14533,12 @@
  introductory message in \fB.hg/last\-email.txt\fP.
  .sp
  The default behavior of this command can be customized through
@@ -10578,7 +10923,7 @@
  hg email \-r 3000          # send patch 3000 only
  hg email \-r 3000 \-r 3001  # send patches 3000 and 3001
  hg email \-r 3000:3005     # send patches 3000 through 3005
-@@ -14223,7 +14195,7 @@
+@@ -14589,7 +14561,7 @@
  hg email \-o \-m mbox &&    # generate an mbox file ...
    formail \-s sendmail \e   # ... and use formail to send from the mbox
      \-bm \-t < mbox         # ... using sendmail
@@ -10587,7 +10932,7 @@
  .fi
  .sp
  Before using this command, you will need to enable email in your
-@@ -14230,7 +14202,7 @@
+@@ -14596,7 +14568,7 @@
  hgrc. See the [email] section in hgrc(5) for details.
  .sp
  Options:
@@ -10596,7 +10941,7 @@
  .TP
  .B \-g,  \-\-git
  .
-@@ -14351,7 +14323,7 @@
+@@ -14717,7 +14689,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -10605,7 +10950,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS purge
-@@ -14363,9 +14335,9 @@
+@@ -14729,9 +14701,9 @@
  removes files not tracked by Mercurial:
  .sp
  .nf
@@ -10617,7 +10962,7 @@
  .fi
  .sp
  Delete files not known to Mercurial. This is useful to test local
-@@ -14372,18 +14344,18 @@
+@@ -14738,18 +14710,18 @@
  and uncommitted changes in an otherwise\-clean source tree.
  .sp
  This means that purge will delete the following by default:
@@ -10640,7 +10985,7 @@
  .IP \(bu 2
  .
  Modified and unmodified tracked files
-@@ -14392,8 +14364,8 @@
+@@ -14758,8 +14730,8 @@
  Ignored files (unless \-\-all is specified)
  .IP \(bu 2
  .
@@ -10651,7 +10996,7 @@
  .sp
  The \-\-files and \-\-dirs options can be used to direct purge to delete
  only files, only directories, or both. If neither option is given,
-@@ -14408,7 +14380,7 @@
+@@ -14774,7 +14746,7 @@
  option.
  .sp
  Options:
@@ -10660,7 +11005,7 @@
  .TP
  .B \-a,  \-\-abort\-on\-err
  .
-@@ -14441,15 +14413,15 @@
+@@ -14807,15 +14779,15 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -10681,7 +11026,7 @@
  .SS rebase
  .sp
  command to move sets of revisions to a different ancestor
-@@ -14458,7 +14430,7 @@
+@@ -14824,7 +14796,7 @@
  repository.
  .sp
  For more information:
@@ -10690,7 +11035,7 @@
  .SS Commands
  .SS rebase
  .sp
-@@ -14465,9 +14437,9 @@
+@@ -14831,9 +14803,9 @@
  move changeset (and descendants) to a different branch:
  .sp
  .nf
@@ -10702,7 +11047,7 @@
  .fi
  .sp
  Rebase uses repeated merging to graft changesets from one part of
-@@ -14475,11 +14447,11 @@
+@@ -14841,11 +14813,11 @@
  useful for linearizing \fIlocal\fP changes relative to a master
  development tree.
  .sp
@@ -10718,7 +11063,7 @@
  the current branch contains exactly one other head, the other head
  is merged with by default.  Otherwise, an explicit revision with
  which to merge with must be provided.  (destination changeset is not
-@@ -14487,9 +14459,9 @@
+@@ -14853,9 +14825,9 @@
  descendants.)
  .sp
  Here are the ways to select changesets:
@@ -10731,7 +11076,7 @@
  .IP 1. 3
  .
  Explicitly select them using \fB\-\-rev\fP.
-@@ -14505,9 +14477,9 @@
+@@ -14871,9 +14843,9 @@
  .
  If you do not specify any of \fB\-\-rev\fP, \fBsource\fP, or \fB\-\-base\fP,
  rebase will use \fB\-\-base .\fP as above.
@@ -10742,9 +11087,9 @@
 +.RE
 +.RE
  .sp
- Rebase will destroy original changesets unless you use \fB\-\-keep\fP.
- It will also move your bookmarks (even if you do).
-@@ -14520,7 +14492,7 @@
+ If \fB\-\-source\fP or \fB\-\-rev\fP is used, special names \fBSRC\fP and \fBALLSRC\fP
+ can be used in \fB\-\-dest\fP. Destination would be calculated per source
+@@ -14891,7 +14863,7 @@
  and/or destination.
  .sp
  If you need to use a tool to automate merge/conflict decisions, you
@@ -10753,7 +11098,7 @@
  As a caveat: the tool will not be used to mediate when a file was
  deleted, there is no hook presently available for this.
  .sp
-@@ -14528,7 +14500,7 @@
+@@ -14899,7 +14871,7 @@
  continued with \-\-continue/\-c or aborted with \-\-abort/\-a.
  .sp
  Examples:
@@ -10762,7 +11107,7 @@
  .IP \(bu 2
  .
  move "local changes" (current commit back to branching point)
-@@ -14535,9 +14507,9 @@
+@@ -14906,9 +14878,9 @@
  to the current branch tip after a pull:
  .sp
  .nf
@@ -10774,7 +11119,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -14544,9 +14516,9 @@
+@@ -14915,9 +14887,9 @@
  move a single changeset to the stable branch:
  .sp
  .nf
@@ -10786,7 +11131,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -14553,9 +14525,9 @@
+@@ -14924,9 +14896,9 @@
  splice a commit and all its descendants onto another part of history:
  .sp
  .nf
@@ -10798,7 +11143,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -14563,9 +14535,9 @@
+@@ -14934,9 +14906,9 @@
  default branch:
  .sp
  .nf
@@ -10810,7 +11155,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -14572,9 +14544,9 @@
+@@ -14943,9 +14915,9 @@
  collapse a sequence of changes into a single commit:
  .sp
  .nf
@@ -10822,7 +11167,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -14581,11 +14553,11 @@
+@@ -14952,9 +14924,9 @@
  move a named branch while preserving its name:
  .sp
  .nf
@@ -10832,12 +11177,25 @@
 -.ft P
 +.ft
  .fi
+ .IP \(bu 2
+ .
+@@ -14961,11 +14933,11 @@
+ stabilize orphaned changesets so history looks linear:
+ .sp
+ .nf
+-.ft C
+-hg rebase \-r \(aqorphan()\-obsolete()\(aq \-d \(aqfirst(max((successors(max(roots(ALLSRC) & ::SRC)^)\-obsolete())::) + max(::((roots(ALLSRC) & ::SRC)^)\-obsolete()))\(aq
+-.ft P
++.ft
++hg rebase \-r 'orphan()\-obsolete()' \-d 'first(max((successors(max(roots(ALLSRC) & ::SRC)^)\-obsolete())::) + max(::((roots(ALLSRC) & ::SRC)^)\-obsolete()))'
++.ft
+ .fi
 -.UNINDENT
 +.RE
  .sp
  Configuration Options:
  .sp
-@@ -14593,23 +14565,23 @@
+@@ -14973,23 +14945,23 @@
  option:
  .sp
  .nf
@@ -10865,8 +11223,21 @@
 +.ft
  .fi
  .sp
+ By default, rebase writes to the working copy, but you can configure it to
+@@ -14997,10 +14969,10 @@
+ working copy is dirty:
+ .sp
+ .nf
+-.ft C
++.ft
+ [rebase]
+ experimental.inmemory = True
+-.ft P
++.ft
+ .fi
+ .sp
  Return Values:
-@@ -14618,7 +14590,7 @@
+@@ -15009,7 +14981,7 @@
  unresolved conflicts.
  .sp
  Options:
@@ -10875,16 +11246,16 @@
  .TP
  .BI \-s,  \-\-source \ <REV>
  .
-@@ -14687,7 +14659,7 @@
+@@ -15074,7 +15046,7 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
- display with template
+ display with template (EXPERIMENTAL)
 -.UNINDENT
 +.RE
  .sp
  [+] marked option can be specified multiple times
  .SS record
-@@ -14695,7 +14667,7 @@
+@@ -15082,7 +15054,7 @@
  commands to interactively select changes for commit/qrefresh (DEPRECATED)
  .sp
  The feature provided by this extension has been moved into core Mercurial as
@@ -10893,7 +11264,7 @@
  .SS Commands
  .SS qrecord
  .sp
-@@ -14702,12 +14674,12 @@
+@@ -15089,12 +15061,12 @@
  interactively record a new patch:
  .sp
  .nf
@@ -10909,7 +11280,7 @@
  usage.
  .SS record
  .sp
-@@ -14714,17 +14686,17 @@
+@@ -15101,17 +15073,17 @@
  interactively select changes to commit:
  .sp
  .nf
@@ -10932,7 +11303,7 @@
  you will be prompted for whether to record changes to each
  modified file, and for files with multiple changes, for each
  change to use. For each query, the following responses are
-@@ -14731,7 +14703,7 @@
+@@ -15118,7 +15090,7 @@
  possible:
  .sp
  .nf
@@ -10941,7 +11312,7 @@
  y \- record this change
  n \- skip this change
  e \- edit this change manually
-@@ -14744,13 +14716,13 @@
+@@ -15131,13 +15103,13 @@
  q \- quit, recording no changes
  
  ? \- display help
@@ -10957,7 +11328,7 @@
  .TP
  .B \-A,  \-\-addremove
  .
-@@ -14815,7 +14787,7 @@
+@@ -15202,7 +15174,7 @@
  .B \-Z,  \-\-ignore\-space\-at\-eol
  .
  ignore changes in whitespace at EOL
@@ -10966,7 +11337,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS releasenotes
-@@ -14824,7 +14796,7 @@
+@@ -15211,7 +15183,7 @@
  .sp
  It is common to maintain files detailing changes in a project between
  releases. Maintaining these files can be difficult and time consuming.
@@ -10975,7 +11346,7 @@
  process simpler by automating it.
  .SS Commands
  .SS releasenotes
-@@ -14832,9 +14804,9 @@
+@@ -15219,9 +15191,9 @@
  parse release notes from commit messages into an output file:
  .sp
  .nf
@@ -10987,7 +11358,7 @@
  .fi
  .sp
  Given an output file and set of revisions, this command will parse commit
-@@ -14844,11 +14816,11 @@
+@@ -15231,11 +15203,11 @@
  directives. These have the form:
  .sp
  .nf
@@ -11001,7 +11372,7 @@
  .fi
  .sp
  Each \fBdirective\fP maps to an output section in a generated release notes
-@@ -14864,7 +14836,7 @@
+@@ -15251,7 +15223,7 @@
  notes to. The format of the file is:
  .sp
  .nf
@@ -11010,7 +11381,7 @@
  Section 1
  =========
  
-@@ -14874,7 +14846,7 @@
+@@ -15261,7 +15233,7 @@
  =========
  
  \&...
@@ -11019,7 +11390,7 @@
  .fi
  .sp
  Only sections with defined release notes are emitted.
-@@ -14882,19 +14854,19 @@
+@@ -15269,19 +15241,19 @@
  If a section only has short\-form notes, it will consist of bullet list:
  .sp
  .nf
@@ -11042,7 +11413,7 @@
  Section
  =======
  
-@@ -14907,7 +14879,7 @@
+@@ -15294,7 +15266,7 @@
  \-\-\-\-\-\-\-\-\-\-\-\-
  
  Description of the second long\-form note.
@@ -11051,7 +11422,7 @@
  .fi
  .sp
  If the \fBFILE\fP argument points to an existing file, that file will be
-@@ -14916,7 +14888,7 @@
+@@ -15303,7 +15275,7 @@
  into this parsed set.
  .sp
  During release notes merging:
@@ -11060,7 +11431,7 @@
  .IP \(bu 2
  .
  Duplicate items are automatically ignored
-@@ -14924,7 +14896,7 @@
+@@ -15311,7 +15283,7 @@
  .
  Items that are different are automatically ignored if the similarity is
  greater than a threshold.
@@ -11069,7 +11440,7 @@
  .sp
  This means that the release notes file can be updated independently from
  this command and changes should not be lost when running this command on
-@@ -14938,7 +14910,7 @@
+@@ -15325,7 +15297,7 @@
  admonitions (if any).
  .sp
  Options:
@@ -11078,7 +11449,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
-@@ -14951,7 +14923,7 @@
+@@ -15338,7 +15310,7 @@
  .B \-l,  \-\-list
  .
  list the available admonitions with their title
@@ -11087,7 +11458,7 @@
  .SS relink
  .sp
  recreates hardlinks between repository clones
-@@ -14961,9 +14933,9 @@
+@@ -15348,9 +15320,9 @@
  recreate hardlinks between two repositories:
  .sp
  .nf
@@ -11099,7 +11470,7 @@
  .fi
  .sp
  When repositories are cloned locally, their data files will be
-@@ -14995,18 +14967,18 @@
+@@ -15382,18 +15354,18 @@
  lot of repositories to act like a scheme, for example:
  .sp
  .nf
@@ -11122,7 +11493,7 @@
  .fi
  .sp
  Additionally there is support for some more complex schemas, for
-@@ -15013,10 +14985,10 @@
+@@ -15400,10 +15372,10 @@
  example used by Google Code:
  .sp
  .nf
@@ -11135,7 +11506,7 @@
  .fi
  .sp
  The syntax is taken from Mercurial templates, and you have unlimited
-@@ -15028,7 +15000,7 @@
+@@ -15415,7 +15387,7 @@
  For convenience, the extension adds these schemes by default:
  .sp
  .nf
@@ -11144,7 +11515,7 @@
  [schemes]
  py = http://hg.python.org/
  bb = https://bitbucket.org/
-@@ -15035,7 +15007,7 @@
+@@ -15422,7 +15394,7 @@
  bb+ssh = ssh://hg@bitbucket.org/
  gcode = https://{1}.googlecode.com/hg/
  kiln = https://{1}.kilnhg.com/Repo/
@@ -11153,7 +11524,7 @@
  .fi
  .sp
  You can override a predefined scheme by defining a new scheme with the
-@@ -15046,19 +15018,19 @@
+@@ -15433,19 +15405,19 @@
  share a common history between several working directories
  .SS Automatic Pooled Storage for Clones
  .sp
@@ -11177,7 +11548,7 @@
  storage instead of creating a store inside each clone.
  .TP
  .B \fBshare.poolnaming\fP
-@@ -15070,13 +15042,13 @@
+@@ -15457,13 +15429,13 @@
  root/initial changeset is identical. In this mode, the local shared
  repository is an aggregate of all encountered remote repositories.
  .sp
@@ -11194,7 +11565,7 @@
  .SS Commands
  .SS share
  .sp
-@@ -15083,9 +15055,9 @@
+@@ -15470,9 +15442,9 @@
  create a new shared repository:
  .sp
  .nf
@@ -11206,7 +11577,7 @@
  .fi
  .sp
  Initialize a new repository and working directory that shares its
-@@ -15103,7 +15075,7 @@
+@@ -15490,7 +15462,7 @@
  .RE
  .sp
  Options:
@@ -11215,7 +11586,7 @@
  .TP
  .B \-U,  \-\-noupdate
  .
-@@ -15116,15 +15088,15 @@
+@@ -15503,15 +15475,15 @@
  .B \-\-relative
  .
  point to source using a relative path (EXPERIMENTAL)
@@ -11234,7 +11605,7 @@
  .fi
  .sp
  Copy the store data to the repo and remove the sharedpath data.
-@@ -15138,7 +15110,7 @@
+@@ -15525,7 +15497,7 @@
  .sp
  Later on, the "hg unshelve" command restores the changes saved by "hg
  shelve". Changes can be restored even after updating to a different
@@ -11243,7 +11614,7 @@
  conflicts if necessary.
  .sp
  You can have more than one shelved change outstanding at a time; each
-@@ -15150,9 +15122,9 @@
+@@ -15537,9 +15509,9 @@
  save and set aside changes from the working directory:
  .sp
  .nf
@@ -11255,7 +11626,7 @@
  .fi
  .sp
  Shelving takes files that "hg status" reports as not clean, saves
-@@ -15186,7 +15158,7 @@
+@@ -15573,7 +15545,7 @@
  all shelved changes, use \fB\-\-cleanup\fP.
  .sp
  Options:
@@ -11264,7 +11635,7 @@
  .TP
  .B \-A,  \-\-addremove
  .
-@@ -15243,7 +15215,7 @@
+@@ -15630,7 +15602,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -11273,7 +11644,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS unshelve
-@@ -15251,9 +15223,9 @@
+@@ -15638,9 +15610,9 @@
  restore a shelved change to the working directory:
  .sp
  .nf
@@ -11285,7 +11656,7 @@
  .fi
  .sp
  This command accepts an optional name of a shelved change to
-@@ -15288,7 +15260,7 @@
+@@ -15675,7 +15647,7 @@
  prevents from deciding exact order of them, for safety.
  .sp
  Options:
@@ -11294,7 +11665,7 @@
  .TP
  .B \-a,  \-\-abort
  .
-@@ -15313,18 +15285,18 @@
+@@ -15700,18 +15672,18 @@
  .BI \-\-date \ <DATE>
  .
  set date for temporary commits (DEPRECATED)
@@ -11316,7 +11687,7 @@
  .TP
  .B \fBshow.aliasprefix\fP
  .sp
-@@ -15334,7 +15306,7 @@
+@@ -15721,7 +15693,7 @@
  .sp
  Aliases that would conflict with existing registrations will not be
  performed.
@@ -11325,7 +11696,7 @@
  .SS Commands
  .SS show
  .sp
-@@ -15341,9 +15313,9 @@
+@@ -15728,9 +15700,9 @@
  show various repository information:
  .sp
  .nf
@@ -11337,7 +11708,7 @@
  .fi
  .sp
  A requested view of repository data is displayed.
-@@ -15365,15 +15337,15 @@
+@@ -15752,15 +15724,15 @@
  .sp
  stack       current line of work
  .sp
@@ -11356,7 +11727,7 @@
  .SS sparse
  .sp
  allow sparse checkouts of the working directory (EXPERIMENTAL)
-@@ -15407,7 +15379,7 @@
+@@ -15794,7 +15766,7 @@
  have \fB[include]\fP after \fB[exclude]\fP.
  .sp
  Non\-special lines resemble file patterns to be added to either includes
@@ -11365,7 +11736,7 @@
  Patterns are interpreted as \fBglob:\fP by default and match against the
  root of the repository.
  .sp
-@@ -15421,7 +15393,7 @@
+@@ -15808,7 +15780,7 @@
  between both projects. Your sparse config files may resemble:
  .sp
  .nf
@@ -11374,7 +11745,7 @@
  # frontend.sparse
  frontend/**
  tools/**
-@@ -15429,15 +15401,15 @@
+@@ -15816,15 +15788,15 @@
  # backend.sparse
  backend/**
  tools/**
@@ -11393,7 +11764,7 @@
  [include]
  backend/**
  tools/**
-@@ -15444,7 +15416,7 @@
+@@ -15831,7 +15803,7 @@
  
  [exclude]
  tools/tests/**
@@ -11401,8 +11772,38 @@
 +.ft
  .fi
  .SS Commands
+ .SS split
+@@ -15843,9 +15815,9 @@
+ split a changeset into smaller ones:
+ .sp
+ .nf
+-.ft C
++.ft
+ hg split [\-\-no\-rebase] [[\-r] REV]
+-.ft P
++.ft
+ .fi
+ .sp
+ Repeatedly prompt changes and commit message for new changesets until there
+@@ -15857,7 +15829,7 @@
+ changeset. Use \-\-no\-rebase to avoid the rebase.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .BI \-r,  \-\-rev \ <REV>
+ .
+@@ -15874,7 +15846,7 @@
+ .BI \-u,  \-\-user \ <USER>
+ .
+ record the specified user as committer
+-.UNINDENT
++.RE
  .SS strip
-@@ -15459,9 +15431,9 @@
+ .sp
+ strip changesets and their descendants from history
+@@ -15887,9 +15859,9 @@
  strip changesets and all their descendants from the repository:
  .sp
  .nf
@@ -11414,7 +11815,7 @@
  .fi
  .sp
  The strip command removes the specified changesets and all their
-@@ -15475,8 +15447,8 @@
+@@ -15903,8 +15875,8 @@
  completes.
  .sp
  Any stripped changesets are stored in \fB.hg/strip\-backup\fP as a
@@ -11425,7 +11826,7 @@
  where BUNDLE is the bundle file created by the strip. Note that
  the local revision numbers will in general be different after the
  restore.
-@@ -15491,7 +15463,7 @@
+@@ -15919,7 +15891,7 @@
  Return 0 on success.
  .sp
  Options:
@@ -11434,7 +11835,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV[+]>
  .
-@@ -15520,7 +15492,7 @@
+@@ -15948,7 +15920,7 @@
  .BI \-B,  \-\-bookmark \ <VALUE[+]>
  .
  remove revs only reachable from given bookmark
@@ -11443,7 +11844,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS transplant
-@@ -15528,7 +15500,7 @@
+@@ -15956,7 +15928,7 @@
  command to transplant changesets from another branch
  .sp
  This extension allows you to transplant changes to another parent revision,
@@ -11452,7 +11853,7 @@
  .sp
  Transplanted patches are recorded in .hg/transplant/transplants, as a
  map from a changeset hash to its hash in the source repository.
-@@ -15538,9 +15510,9 @@
+@@ -15966,9 +15938,9 @@
  transplant changesets from another branch:
  .sp
  .nf
@@ -11464,7 +11865,7 @@
  .fi
  .sp
  Selected changesets will be applied on top of the current working
-@@ -15557,9 +15529,9 @@
+@@ -15985,9 +15957,9 @@
  of the form:
  .sp
  .nf
@@ -11476,7 +11877,7 @@
  .fi
  .sp
  You can rewrite the changelog message with the \-\-filter option.
-@@ -15575,17 +15547,17 @@
+@@ -16003,17 +15975,17 @@
  with \-\-branch will be transplanted.
  .sp
  Example:
@@ -11498,7 +11899,7 @@
  .sp
  You can optionally mark selected transplanted changesets as merge
  changesets. You will not be prompted to transplant any ancestors
-@@ -15593,17 +15565,17 @@
+@@ -16021,17 +15993,17 @@
  normally instead of transplanting them.
  .sp
  Merge changesets may be transplanted directly by specifying the
@@ -11521,7 +11922,7 @@
  .TP
  .BI \-s,  \-\-source \ <REPO>
  .
-@@ -15644,7 +15616,7 @@
+@@ -16072,7 +16044,7 @@
  .BI \-\-filter \ <CMD>
  .
  filter changesets through command
@@ -11530,7 +11931,19 @@
  .sp
  [+] marked option can be specified multiple times
  .SS uncommit
-@@ -15661,9 +15633,9 @@
+@@ -16089,9 +16061,9 @@
+ undo the most recent amend operation on a current changeset:
+ .sp
+ .nf
+-.ft C
++.ft
+ hg unamend
+-.ft P
++.ft
+ .fi
+ .sp
+ This command will roll back to the previous version of a changeset,
+@@ -16103,9 +16075,9 @@
  uncommit part or all of a local changeset:
  .sp
  .nf
@@ -11542,7 +11955,7 @@
  .fi
  .sp
  This command undoes the effect of a local commit, returning the affected
-@@ -15672,7 +15644,7 @@
+@@ -16114,7 +16086,7 @@
  modified in the working directory.
  .sp
  Options:
@@ -11551,7 +11964,7 @@
  .TP
  .B \-\-keep
  .
-@@ -15685,7 +15657,7 @@
+@@ -16127,7 +16099,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -11560,7 +11973,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS win32mbcs
-@@ -15700,7 +15672,7 @@
+@@ -16142,7 +16114,7 @@
  operation.
  .sp
  This extension is useful for:
@@ -11569,7 +11982,7 @@
  .IP \(bu 2
  .
  Japanese Windows users using shift_jis encoding.
-@@ -15711,10 +15683,10 @@
+@@ -16153,10 +16125,10 @@
  .
  All users who use a repository with one of problematic encodings on
  case\-insensitive file system.
@@ -11582,7 +11995,7 @@
  .IP \(bu 2
  .
  Any user who use only ASCII chars in path.
-@@ -15721,10 +15693,10 @@
+@@ -16163,10 +16135,10 @@
  .IP \(bu 2
  .
  Any user who do not use any of problematic encodings.
@@ -11595,7 +12008,7 @@
  .IP \(bu 2
  .
  You should use single encoding in one repository.
-@@ -15734,16 +15706,16 @@
+@@ -16176,16 +16148,16 @@
  .IP \(bu 2
  .
  win32mbcs is not compatible with fixutf8 extension.
@@ -11615,7 +12028,7 @@
  .fi
  .sp
  It is useful for the users who want to commit with UTF\-8 log message.
-@@ -15750,8 +15722,8 @@
+@@ -16192,8 +16164,8 @@
  .SS win32text
  .sp
  perform automatic newline conversion (DEPRECATED)
@@ -11626,7 +12039,7 @@
  .sp
  Deprecation: The win32text extension requires each user to configure
  the extension again and again for each clone since the configuration
-@@ -15760,13 +15732,13 @@
+@@ -16202,13 +16174,13 @@
  We have therefore made the \fBeol\fP as an alternative. The \fBeol\fP
  uses a version controlled file for its configuration and each clone
  will therefore use the right settings from the start.
@@ -11643,7 +12056,7 @@
  [extensions]
  win32text =
  [encode]
-@@ -15776,17 +15748,17 @@
+@@ -16218,17 +16190,17 @@
  [decode]
  ** = cleverdecode:
  # or ** = macdecode:
@@ -11664,7 +12077,7 @@
  .fi
  .sp
  To do the same check on a server to prevent CRLF/CR from being
-@@ -15793,11 +15765,11 @@
+@@ -16235,11 +16207,11 @@
  pushed or pulled:
  .sp
  .nf
@@ -11678,7 +12091,7 @@
  .fi
  .SS zeroconf
  .sp
-@@ -15808,33 +15780,33 @@
+@@ -16250,33 +16222,33 @@
  without knowing their actual IP address.
  .sp
  To allow other people to discover your repository using run
@@ -11721,7 +12134,7 @@
  files.
  .TP
  .B \fB.hgignore\fP
-@@ -15841,13 +15813,13 @@
+@@ -16283,13 +16255,13 @@
  .sp
  This file contains regular expressions (one per line) that
  describe file names that should be ignored by \fBhg\fP. For details,
@@ -11737,7 +12150,7 @@
  .TP
  .B \fB.hgsubstate\fP
  .sp
-@@ -15862,7 +15834,7 @@
+@@ -16304,7 +16276,7 @@
  .TP
  .B \fB.hg/last\-message.txt\fP
  .sp
@@ -11746,7 +12159,7 @@
  in case the commit fails.
  .TP
  .B \fB.hg/localtags\fP
-@@ -15870,28 +15842,34 @@
+@@ -16312,28 +16284,34 @@
  This file can be used to define local tags which are not shared among
  repositories. The file format is the same as for \fB.hgtags\fP, but it is
  encoded using the local system encoding.
@@ -11787,9 +12200,9 @@
 +Mailing list: https://www.mercurial\-scm.org/mailman/listinfo/mercurial/
  .SH COPYING
  .sp
- Copyright (C) 2005\-2017 Matt Mackall.
---- mercurial-4.4.1/doc/hgignore.5.orig	Tue Nov  7 21:15:41 2017
-+++ mercurial-4.4.1/doc/hgignore.5	Fri Nov 10 17:55:56 2017
+ Copyright (C) 2005\-2018 Matt Mackall.
+--- mercurial-4.5.2/doc/hgignore.5.orig	Tue Mar  6 22:20:03 2018
++++ mercurial-4.5.2/doc/hgignore.5	Wed Mar  7 11:24:40 2018
 @@ -3,33 +3,6 @@
  .TH HGIGNORE 5 "" "" "Mercurial Manual"
  .SH NAME
@@ -11915,8 +12328,8 @@
  .SH COPYING
  .sp
  This manual page is copyright 2006 Vadim Gelfer.
---- mercurial-4.4.1/doc/hgrc.5.orig	Tue Nov  7 21:15:42 2017
-+++ mercurial-4.4.1/doc/hgrc.5	Fri Nov 10 17:56:03 2017
+--- mercurial-4.5.2/doc/hgrc.5.orig	Tue Mar  6 22:20:04 2018
++++ mercurial-4.5.2/doc/hgrc.5	Wed Mar  7 11:24:48 2018
 @@ -3,33 +3,6 @@
  .TH HGRC 5 "" "" "Mercurial Manual"
  .SH NAME
@@ -13610,9 +14023,9 @@
 -.INDENT 0.0
 +.RS 0
  .TP
- .B \fBcompressionengines\fP
+ .B \fBbookmarks\-pushkey\-compat\fP
  .sp
-@@ -2160,10 +2018,10 @@
+@@ -2169,10 +2027,10 @@
  .sp
  The order of compression engines determines their priority, the first
  having the highest priority. If a compression engine is not listed
@@ -13625,7 +14038,7 @@
  default wire protocol priority.
  .sp
  Older Mercurial clients only support zlib compression and this setting
-@@ -2202,19 +2060,19 @@
+@@ -2211,19 +2069,19 @@
  .B \fBconcurrent\-push\-mode\fP
  .sp
  Level of allowed race condition between two pushing clients.
@@ -13650,7 +14063,7 @@
  .TP
  .B \fBvalidate\fP
  .sp
-@@ -2290,11 +2148,11 @@
+@@ -2299,11 +2157,11 @@
  This option only impacts the HTTP server.
  .sp
  See also \fBserver.zliblevel\fP.
@@ -13664,7 +14077,7 @@
  .TP
  .B \fBhost\fP
  .sp
-@@ -2325,7 +2183,7 @@
+@@ -2334,7 +2192,7 @@
  .sp
  Optional. The hostname that the sender can use to identify
  itself to the MTA.
@@ -13673,7 +14086,7 @@
  .SS \fBsubpaths\fP
  .sp
  Subrepository source URLs can go stale if a remote server changes name
-@@ -2333,9 +2191,9 @@
+@@ -2342,9 +2200,9 @@
  rewrite rules of the form:
  .sp
  .nf
@@ -13685,7 +14098,7 @@
  .fi
  .sp
  where \fBpattern\fP is a regular expression matching a subrepository
-@@ -2344,9 +2202,9 @@
+@@ -2353,9 +2211,9 @@
  \fBreplacements\fP. For instance:
  .sp
  .nf
@@ -13697,7 +14110,7 @@
  .fi
  .sp
  rewrites \fBhttp://server/foo\-hg/\fP into \fBhttp://hg.server/foo/\fP.
-@@ -2353,12 +2211,12 @@
+@@ -2362,12 +2220,12 @@
  .sp
  Relative subrepository paths are first made absolute, and the
  rewrite rules are then applied on the full (absolute) path. If \fBpattern\fP
@@ -13712,7 +14125,7 @@
  .sp
  Security note: auditing in Mercurial is known to be insufficient to
  prevent clone\-time code execution with carefully constructed Git
-@@ -2366,13 +2224,13 @@
+@@ -2375,13 +2233,13 @@
  subrepos. Both Git and Subversion subrepos are disabled by default
  out of security concerns. These subrepo types can be enabled using
  the respective options below.
@@ -13728,7 +14141,7 @@
  will fail for all subrepository types.
  (default: true)
  .TP
-@@ -2399,18 +2257,18 @@
+@@ -2408,18 +2266,18 @@
  .sp
  See the security note above before enabling Subversion subrepos.
  (default: false)
@@ -13751,7 +14164,7 @@
  user or to a trusted group, as various hgrc features allow arbitrary
  commands to be run. This issue is often encountered when configuring
  hooks or extensions for shared repositories or servers. However,
-@@ -2422,7 +2280,7 @@
+@@ -2431,7 +2289,7 @@
  group with name \fB*\fP. These settings must be placed in an
  \fIalready\-trusted file\fP to take effect, such as \fB$HOME/.hgrc\fP of the
  user or service running Mercurial.
@@ -13760,7 +14173,7 @@
  .TP
  .B \fBusers\fP
  .sp
-@@ -2431,17 +2289,17 @@
+@@ -2440,17 +2298,17 @@
  .B \fBgroups\fP
  .sp
  Comma\-separated list of trusted groups.
@@ -13781,7 +14194,7 @@
  (default: True)
  .TP
  .B \fBaskusername\fP
-@@ -2456,7 +2314,7 @@
+@@ -2465,7 +2323,7 @@
  .sp
  Whether the "clone bundles" feature is enabled.
  .sp
@@ -13790,7 +14203,7 @@
  bundle file from a URL instead of using the normal exchange mechanism.
  .sp
  This can likely result in faster and more reliable clones.
-@@ -2474,7 +2332,7 @@
+@@ -2483,7 +2341,7 @@
  clone, this would add significant and unexpected load to the server
  since the server is expecting clone operations to be offloaded to
  pre\-generated bundles. Failing fast (the default behavior) ensures
@@ -13799,7 +14212,7 @@
  fails.
  .sp
  (default: False)
-@@ -2489,17 +2347,17 @@
+@@ -2498,17 +2356,17 @@
  bundle over another.
  .sp
  The following keys are defined by Mercurial:
@@ -13820,7 +14233,7 @@
  .sp
  Server operators may define custom keys.
  .sp
-@@ -2512,7 +2370,7 @@
+@@ -2521,7 +2379,7 @@
  .sp
  When to colorize output. Possible value are Boolean ("yes" or "no"), or
  "debug", or "always". (default: "yes"). "yes" will use color whenever it
@@ -13829,7 +14242,7 @@
  .TP
  .B \fBcommitsubrepos\fP
  .sp
-@@ -2531,7 +2389,7 @@
+@@ -2540,7 +2398,7 @@
  .TP
  .B \fBfallbackencoding\fP
  .sp
@@ -13838,7 +14251,7 @@
  UTF\-8. (default: ISO\-8859\-1)
  .TP
  .B \fBgraphnodetemplate\fP
-@@ -2555,12 +2413,12 @@
+@@ -2564,12 +2422,12 @@
  .B \fBinterface\fP
  .sp
  Select the default interface for interactive features (default: text).
@@ -13854,7 +14267,7 @@
  This config overrides the interface specified by ui.interface.
  .TP
  .B \fBlogtemplate\fP
-@@ -2570,7 +2428,7 @@
+@@ -2579,7 +2437,7 @@
  .B \fBmerge\fP
  .sp
  The conflict resolution program to use during a manual merge.
@@ -13863,7 +14276,7 @@
  For configuring merge tools see the \fB[merge\-tools]\fP section.
  .TP
  .B \fBmergemarkers\fP
-@@ -2577,7 +2435,7 @@
+@@ -2586,7 +2444,7 @@
  .sp
  Sets the merge conflict marker label styling. The \fBdetailed\fP
  style uses the \fBmergemarkertemplate\fP setting to style the labels.
@@ -13872,7 +14285,7 @@
  One of \fBbasic\fP or \fBdetailed\fP.
  (default: \fBbasic\fP)
  .TP
-@@ -2584,7 +2442,7 @@
+@@ -2593,7 +2451,7 @@
  .B \fBmergemarkertemplate\fP
  .sp
  The template used to print the commit description next to each conflict
@@ -13881,7 +14294,7 @@
  format.
  .sp
  Defaults to showing the hash, tags, branches, bookmarks, author, and
-@@ -2607,7 +2465,7 @@
+@@ -2616,7 +2474,7 @@
  .TP
  .B \fBpaginate\fP
  .sp
@@ -13890,7 +14303,7 @@
  for details.
  .TP
  .B \fBpatch\fP
-@@ -2628,12 +2486,12 @@
+@@ -2637,12 +2495,12 @@
  .sp
  Check for portable filenames. Can be \fBwarn\fP, \fBignore\fP or \fBabort\fP.
  (default: \fBwarn\fP)
@@ -13905,7 +14318,7 @@
  Windows because it contains reserved parts like \fBAUX\fP, reserved
  characters like \fB:\fP, or would cause a case collision with an existing
  file).
-@@ -2640,7 +2498,7 @@
+@@ -2649,7 +2507,7 @@
  .TP
  .B \fBignore\fP
  .sp
@@ -13914,7 +14327,7 @@
  .TP
  .B \fBabort\fP
  .sp
-@@ -2653,9 +2511,7 @@
+@@ -2662,9 +2520,7 @@
  .B \fBfalse\fP
  .sp
  Alias for \fBignore\fP.
@@ -13925,7 +14338,7 @@
  .TP
  .B \fBquiet\fP
  .sp
-@@ -2723,26 +2579,26 @@
+@@ -2744,26 +2600,26 @@
  occurs. Setting this to True will make Mercurial print a traceback
  on all exceptions, even those recognized by Mercurial (such as
  IOError or MemoryError). (default: False)
@@ -13961,7 +14374,7 @@
  <fred@example.com>\fP. Environment variables in the
  username are expanded.
  .sp
-@@ -2754,11 +2610,11 @@
+@@ -2775,11 +2631,11 @@
  .B \fBverbose\fP
  .sp
  Increase the amount of output printed. (default: False)
@@ -13975,19 +14388,19 @@
  run through a webserver (\fBhgweb.cgi\fP and the derivatives for FastCGI
  and WSGI).
  .sp
-@@ -2774,9 +2630,9 @@
+@@ -2795,9 +2651,9 @@
  command line:
  .sp
  .nf
 -.ft C
 +.ft
- $ hg \-\-config web.allow_push=* \-\-config web.push_ssl=False serve
+ $ hg \-\-config web.allow\-push=* \-\-config web.push_ssl=False serve
 -.ft P
 +.ft
  .fi
  .sp
  Note that this will allow anybody to push anything to the server and
-@@ -2783,7 +2639,7 @@
+@@ -2804,7 +2660,7 @@
  that this should not be used for public servers.
  .sp
  The full set of options is:
@@ -13996,7 +14409,7 @@
  .TP
  .B \fBaccesslog\fP
  .sp
-@@ -2863,13 +2719,13 @@
+@@ -2884,13 +2740,13 @@
  To disable SSL verification temporarily, specify \fB\-\-insecure\fP from
  command line.
  .sp
@@ -14012,7 +14425,7 @@
  \-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
  \&... (certificate in base64 PEM encoding) ...
  \-\-\-\-\-END CERTIFICATE\-\-\-\-\-
-@@ -2876,7 +2732,7 @@
+@@ -2897,7 +2753,7 @@
  \-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
  \&... (certificate in base64 PEM encoding) ...
  \-\-\-\-\-END CERTIFICATE\-\-\-\-\-
@@ -14021,7 +14434,7 @@
  .fi
  .TP
  .B \fBcache\fP
-@@ -2885,7 +2741,7 @@
+@@ -2906,7 +2762,7 @@
  .TP
  .B \fBcertificate\fP
  .sp
@@ -14030,7 +14443,7 @@
  .TP
  .B \fBcollapse\fP
  .sp
-@@ -2957,7 +2813,7 @@
+@@ -2978,7 +2834,7 @@
  .TP
  .B \fBdescription\fP
  .sp
@@ -14039,7 +14452,7 @@
  (default: "unknown")
  .TP
  .B \fBencoding\fP
-@@ -3031,7 +2887,7 @@
+@@ -3052,7 +2908,7 @@
  .TP
  .B \fBprefix\fP
  .sp
@@ -14048,7 +14461,7 @@
  .TP
  .B \fBpush_ssl\fP
  .sp
-@@ -3070,7 +2926,7 @@
+@@ -3091,7 +2947,7 @@
  .sp
  Where to find the HTML templates. The default path to the HTML templates
  can be obtained from \fBhg debuginstall\fP.
@@ -14057,7 +14470,7 @@
  .SS \fBwebsub\fP
  .sp
  Web substitution filter definition. You can use this section to
-@@ -3092,9 +2948,9 @@
+@@ -3113,9 +2969,9 @@
  which in turn imitates the Unix sed replacement syntax:
  .sp
  .nf
@@ -14069,7 +14482,7 @@
  .fi
  .sp
  You can use any separator other than "/". The final "i" is optional
-@@ -3103,12 +2959,12 @@
+@@ -3124,12 +2980,12 @@
  Examples:
  .sp
  .nf
@@ -14084,16 +14497,16 @@
  .fi
  .SS \fBworker\fP
  .sp
-@@ -3115,7 +2971,7 @@
+@@ -3136,7 +2992,7 @@
  Parallel master/worker configuration. We currently perform working
  directory updates in parallel on Unix\-like systems, which greatly
  helps performance.
 -.INDENT 0.0
 +.RS 0
  .TP
- .B \fBnumcpus\fP
+ .B \fBenabled\fP
  .sp
-@@ -3126,7 +2982,7 @@
+@@ -3152,7 +3008,7 @@
  .B \fBbackgroundclose\fP
  .sp
  Whether to enable closing file handles on background threads during certain
@@ -14102,7 +14515,7 @@
  handles that have been written or appended to. By performing file closing
  on background threads, file write rate can increase substantially.
  (default: true on Windows, false elsewhere)
-@@ -3134,7 +2990,7 @@
+@@ -3160,7 +3016,7 @@
  .B \fBbackgroundcloseminfilecount\fP
  .sp
  Minimum number of files required to trigger background file closing.
@@ -14111,7 +14524,7 @@
  threads.
  (default: 2048)
  .TP
-@@ -3150,18 +3006,18 @@
+@@ -3176,18 +3032,18 @@
  Number of threads to process background file closes. Only relevant if
  \fBbackgroundclose\fP is enabled.
  (default: 4)
@@ -14132,6 +14545,6 @@
  .sp
 -This manual page is copyright 2005 Bryan O\(aqSullivan.
 +This manual page is copyright 2005 Bryan O'Sullivan.
- Mercurial is copyright 2005\-2017 Matt Mackall.
+ Mercurial is copyright 2005\-2018 Matt Mackall.
  Free use of this software is granted under the terms of the GNU General
  Public License version 2 or any later version.
-- 
2.11.4.GIT