--- mercurial-2.8.2/doc/hg.1	Wed Jan  1 19:46:47 2014

+++ mercurial-2.8.2/doc/hg.1	Tue Jan  7 15:28:46 2014

@@ -3,33 +3,6 @@

 .TH HG 1 "" "" "Mercurial Manual"

 .SH NAME

 hg \- Mercurial source code management system

-.

-.nr rst2man-indent-level 0

-.

-.de1 rstReportMargin

-\\$1 \\n[an-margin]

-level \\n[rst2man-indent-level]

-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]

--

-\\n[rst2man-indent0]

-\\n[rst2man-indent1]

-\\n[rst2man-indent2]

-..

-.de1 INDENT

-.\" .rstReportMargin pre:

-. RS \\$1

-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]

-. nr rst2man-indent-level +1

-.\" .rstReportMargin post:

-..

-.de UNINDENT

-. RE

-.\" indent \\n[an-margin]

-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]

-.nr rst2man-indent-level -1

-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]

-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u

-..

 .SH SYNOPSIS

 .sp

 \fBhg\fP \fIcommand\fP [\fIoption\fP]... [\fIargument\fP]...

@@ -38,12 +11,12 @@

 The \fBhg\fP command provides a command line interface to the Mercurial

 system.

 .SH COMMAND ELEMENTS

-.INDENT 0.0

+.RS 0

 .TP

 .B files...

 .

 indicates one or more filename or relative path filenames; see

-\%File Name Patterns\: for information on pattern matching

+File Name Patterns for information on pattern matching

 .TP

 .B path

 .

@@ -59,9 +32,9 @@

 .

 either the pathname of a local repository or the URI of a remote

 repository.

-.UNINDENT

+.RE

 .SH OPTIONS

-.INDENT 0.0

+.RS 0

 .TP

 .B \-R,  \-\-repository

 .

@@ -85,7 +58,7 @@

 .TP

 .B \-\-config

 .

-set/override config option (use \(aqsection.name=value\(aq)

+set/override config option (use 'section.name=value')

 .TP

 .B \-\-debug

 .

@@ -126,14 +99,14 @@

 .B \-\-hidden

 .

 consider hidden changesets

-.UNINDENT

+.RE

 .SH COMMANDS

 .SS add

 .sp

 .nf

-.ft C

+.ft

 hg add [OPTION]... [FILE]...

-.ft P

+.ft

 .fi

 .sp

 Schedule files to be version controlled and added to the

@@ -140,15 +113,15 @@

 repository.

 .sp

 The files will be added to the repository at the next commit. To

-undo an add before that, see \%\fBhg forget\fP\:.

+undo an add before that, see \fBhg forget\fP.

 .sp

 If no names are given, add all files to the repository.

 .sp

 An example showing how new (unknown) files are added

-automatically by \%\fBhg add\fP\::

+automatically by \fBhg add\fP:

 .sp

 .nf

-.ft C

+.ft

 $ ls

 foo.c

 $ hg status

@@ -157,13 +130,13 @@

 adding foo.c

 $ hg status

 A foo.c

-.ft P

+.ft

 .fi

 .sp

 Returns 0 if all files are successfully added.

 .sp

 Options:

-.INDENT 0.0

+.RS 0

 .TP

 .B \-I,  \-\-include

 .

@@ -180,13 +153,13 @@

 .B \-n,  \-\-dry\-run

 .

 do not perform actions, just print output

-.UNINDENT

+.RE

 .SS addremove

 .sp

 .nf

-.ft C

+.ft

 hg addremove [OPTION]... [FILE]...

-.ft P

+.ft

 .fi

 .sp

 Add all new files and remove all missing files from the

@@ -193,7 +166,7 @@

 repository.

 .sp

 New files are ignored if they match any of the patterns in

-\fB.hgignore\fP. As with add, these changes take effect at the next

+\fB\&.hgignore\fP. As with add, these changes take effect at the next

 commit.

 .sp

 Use the \-s/\-\-similarity option to detect renamed files. This

@@ -201,7 +174,7 @@

 be identical) as its parameter. With a parameter greater than 0,

 this compares every removed file with every added file and records

 those similar enough as renames. Detecting renamed files this way

-can be expensive. After using this option, \%\fBhg status \-C\fP\: can be

+can be expensive. After using this option, \fBhg status \-C\fP can be

 used to check which files were identified as moved or renamed. If

 not specified, \-s/\-\-similarity defaults to 100 and only renames of

 identical files are detected.

@@ -209,7 +182,7 @@

 Returns 0 if all files are successfully added.

 .sp

 Options:

-.INDENT 0.0

+.RS 0

 .TP

 .B \-s,  \-\-similarity

 .

@@ -226,13 +199,13 @@

 .B \-n,  \-\-dry\-run

 .

 do not perform actions, just print output

-.UNINDENT

+.RE

 .SS annotate

 .sp

 .nf

-.ft C

+.ft

 hg annotate [\-r REV] [\-f] [\-a] [\-u] [\-d] [\-n] [\-c] [\-l] FILE...

-.ft P

+.ft

 .fi

 .sp

 List changes in files, showing the revision id responsible for

@@ -249,7 +222,7 @@

 Returns 0 on success.

 .sp

 Options:

-.INDENT 0.0

+.RS 0

 .TP

 .B \-r,  \-\-rev

 .

@@ -261,7 +234,7 @@

 .TP

 .B \-\-no\-follow

 .

-don\(aqt follow copies and renames

+don't follow copies and renames

 .TP

 .B \-a,  \-\-text

 .

@@ -312,13 +285,13 @@

 exclude names matching the given patterns

 .sp

 aliases: blame

-.UNINDENT

+.RE

 .SS archive

 .sp

 .nf

-.ft C

+.ft

 hg archive [OPTION]... DEST

-.ft P

+.ft

 .fi

 .sp

 By default, the revision used is the parent of the working

@@ -328,15 +301,15 @@

 extension (or override using \-t/\-\-type).

 .sp

 Examples:

-.INDENT 0.0

+.RS 0

 .IP \(bu 2

 .

 create a zip file containing the 1.0 release:

 .sp

 .nf

-.ft C

+.ft

 hg archive \-r 1.0 project\-1.0.zip

-.ft P

+.ft

 .fi

 .IP \(bu 2

 .

@@ -343,14 +316,14 @@

 create a tarball excluding .hg files:

 .sp

 .nf

-.ft C

+.ft

 hg archive project.tar.gz \-X ".hg*"

-.ft P

+.ft

 .fi

-.UNINDENT

+.RE

 .sp

 Valid types are:

-.INDENT 0.0

+.RS 0

 .TP

 .B \fBfiles\fP

 .sp

@@ -375,10 +348,10 @@

 .B \fBzip\fP

 .sp

 zip archive, compressed using deflate

-.UNINDENT

+.RE

 .sp

 The exact name of the destination archive or directory is given

-using a format string; see \%\fBhg help export\fP\: for details.

+using a format string; see \fBhg help export\fP for details.

 .sp

 Each member added to an archive file has a directory prefix

 prepended. Use \-p/\-\-prefix to specify a format string for the

@@ -388,7 +361,7 @@

 Returns 0 on success.

 .sp

 Options:

-.INDENT 0.0

+.RS 0

 .TP

 .B \-\-no\-decode

 .

@@ -417,13 +390,13 @@

 .B \-X,  \-\-exclude

 .

 exclude names matching the given patterns

-.UNINDENT

+.RE

 .SS backout

 .sp

 .nf

-.ft C

+.ft

 hg backout [OPTION]... [\-r] REV

-.ft P

+.ft

 .fi

 .sp

 Prepare a new changeset with the effect of REV undone in the

@@ -444,16 +417,16 @@

 working directory and a new child of REV that simply undoes REV.

 .sp

 Before version 1.7, the behavior without \-\-merge was equivalent

-to specifying \-\-merge followed by \%\fBhg update \-\-clean .\fP\: to

+to specifying \-\-merge followed by \fBhg update \-\-clean .\fP to

 cancel the merge and leave the child of REV as a head to be

 merged separately.

 .sp

-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.

+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.

 .sp

 Returns 0 on success.

 .sp

 Options:

-.INDENT 0.0

+.RS 0

 .TP

 .B \-\-merge

 .

@@ -494,13 +467,13 @@

 .B \-u,  \-\-user

 .

 record the specified user as committer

-.UNINDENT

+.RE

 .SS bisect

 .sp

 .nf

-.ft C

+.ft

 hg bisect [\-gbsr] [\-U] [\-c CMD] [REV]

-.ft P

+.ft

 .fi

 .sp

 This command helps to find changesets which introduce problems. To

@@ -524,16 +497,16 @@

 is bad.

 .sp

 Some examples:

-.INDENT 0.0

+.RS 0

 .IP \(bu 2

 .

 start a bisection with known bad revision 34, and good revision 12:

 .sp

 .nf

-.ft C

+.ft

 hg bisect \-\-bad 34

 hg bisect \-\-good 12

-.ft P

+.ft

 .fi

 .IP \(bu 2

 .

@@ -541,10 +514,10 @@

 bad:

 .sp

 .nf

-.ft C

+.ft

 hg bisect \-\-good

 hg bisect \-\-bad

-.ft P

+.ft

 .fi

 .IP \(bu 2

 .

@@ -552,10 +525,10 @@

 that revision is not usable because of another issue):

 .sp

 .nf

-.ft C

+.ft

 hg bisect \-\-skip

 hg bisect \-\-skip 23

-.ft P

+.ft

 .fi

 .IP \(bu 2

 .

@@ -562,9 +535,9 @@

 skip all revisions that do not touch directories \fBfoo\fP or \fBbar\fP:

 .sp

 .nf

-.ft C

-hg bisect \-\-skip "!( file(\(aqpath:foo\(aq) & file(\(aqpath:bar\(aq) )"

-.ft P

+.ft

+hg bisect \-\-skip "!( file('path:foo') & file('path:bar') )"

+.ft

 .fi

 .IP \(bu 2

 .

@@ -571,22 +544,22 @@

 forget the current bisection:

 .sp

 .nf

-.ft C

+.ft

 hg bisect \-\-reset

-.ft P

+.ft

 .fi

 .IP \(bu 2

 .

-use \(aqmake && make tests\(aq to automatically find the first broken

+use 'make && make tests' to automatically find the first broken

 revision:

 .sp

 .nf

-.ft C

+.ft

 hg bisect \-\-reset

 hg bisect \-\-bad 34

 hg bisect \-\-good 12

 hg bisect \-\-command "make && make tests"

-.ft P

+.ft

 .fi

 .IP \(bu 2

 .

@@ -594,9 +567,9 @@

 bisection:

 .sp

 .nf

-.ft C

+.ft

 hg log \-r "bisect(pruned)"

-.ft P

+.ft

 .fi

 .IP \(bu 2

 .

@@ -604,9 +577,9 @@

 if running with \-U/\-\-noupdate):

 .sp

 .nf

-.ft C

+.ft

 hg log \-r "bisect(current)"

-.ft P

+.ft

 .fi

 .IP \(bu 2

 .

@@ -613,9 +586,9 @@

 see all changesets that took part in the current bisection:

 .sp

 .nf

-.ft C

+.ft

 hg log \-r "bisect(range)"

-.ft P

+.ft

 .fi

 .IP \(bu 2

 .

@@ -622,18 +595,18 @@

 you can even get a nice graph:

 .sp

 .nf

-.ft C

+.ft

 hg log \-\-graph \-r "bisect(range)"

-.ft P

+.ft

 .fi

-.UNINDENT

+.RE

 .sp

-See \%\fBhg help revsets\fP\: for more about the \fIbisect()\fP keyword.

+See \fBhg help revsets\fP for more about the \fIbisect()\fP keyword.

 .sp

 Returns 0 on success.

 .sp

 Options:

-.INDENT 0.0

+.RS 0

 .TP

 .B \-r,  \-\-reset

 .

@@ -662,31 +635,31 @@

 .B \-U,  \-\-noupdate

 .

 do not update to target

-.UNINDENT

+.RE

 .SS bookmarks

 .sp

 .nf