--- mercurial-3.2.3/doc/hg.1.orig	Thu Dec 18 12:59:32 2014

+++ mercurial-3.2.3/doc/hg.1	Thu Dec 18 18:23:28 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

 .BI \-R,  \-\-repository \ <REPO>

 .

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

 .TP

 .BI \-\-config \ <CONFIG[+]>

 .

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

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

 .TP

 .B \-\-debug

 .

@@ -126,7 +99,7 @@

 .B \-\-hidden

 .

 consider hidden changesets

-.UNINDENT

+.RE

 .sp

 [+] marked option can be specified multiple times

 .SH COMMANDS

@@ -135,9 +108,9 @@

 add the specified files on the next commit:

 .sp

 .nf

-.ft C

+.ft

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

-.ft P

+.ft

 .fi

 .sp

 Schedule files to be version controlled and added to the

@@ -144,15 +117,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

@@ -161,13 +134,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

 .BI \-I,  \-\-include \ <PATTERN[+]>

 .

@@ -184,7 +157,7 @@

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

 .

 do not perform actions, just print output

-.UNINDENT

+.RE

 .sp

 [+] marked option can be specified multiple times

 .SS addremove

@@ -192,9 +165,9 @@

 add all new files, delete all missing files:

 .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

@@ -201,7 +174,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

@@ -209,7 +182,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.

@@ -217,7 +190,7 @@

 Returns 0 if all files are successfully added.

 .sp

 Options:

-.INDENT 0.0

+.RS 0

 .TP

 .BI \-s,  \-\-similarity \ <SIMILARITY>

 .

@@ -234,7 +207,7 @@

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

 .

 do not perform actions, just print output

-.UNINDENT

+.RE

 .sp

 [+] marked option can be specified multiple times

 .SS annotate

@@ -242,9 +215,9 @@

 show changeset information by line for each file:

 .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

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

 Returns 0 on success.

 .sp

 Options:

-.INDENT 0.0

+.RS 0

 .TP

 .BI \-r,  \-\-rev \ <REV>

 .

@@ -273,7 +246,7 @@

 .TP

 .B \-\-no\-follow

 .

-don\(aqt follow copies and renames

+don't follow copies and renames

 .TP

 .B \-a,  \-\-text

 .

@@ -326,23 +299,23 @@

 .BI \-T,  \-\-template \ <TEMPLATE>

 .

 display with template (DEPRECATED)

-.UNINDENT

+.RE

 .sp

 [+] marked option can be specified multiple times

-.INDENT 0.0

-.INDENT 3.5

+.RS 0

+.RS 3

 .sp

 aliases: blame

-.UNINDENT

-.UNINDENT

+.RE

+.RE

 .SS archive

 .sp

 create an unversioned archive of a repository revision:

 .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

@@ -352,15 +325,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

 .

@@ -367,14 +340,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

@@ -399,10 +372,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

@@ -412,7 +385,7 @@

 Returns 0 on success.

 .sp

 Options:

-.INDENT 0.0

+.RS 0

 .TP

 .B \-\-no\-decode

 .

@@ -441,7 +414,7 @@

 .BI \-X,  \-\-exclude \ <PATTERN[+]>

 .

 exclude names matching the given patterns

-.UNINDENT

+.RE

 .sp

 [+] marked option can be specified multiple times

 .SS backout

@@ -449,9 +422,9 @@

 reverse effect of earlier changeset:

 .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

@@ -472,17 +445,17 @@

 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, 1 if nothing to backout or there are unresolved

 files.

 .sp

 Options:

-.INDENT 0.0

+.RS 0

 .TP

 .B \-\-merge

 .

@@ -527,7 +500,7 @@

 .BI \-u,  \-\-user \ <USER>

 .

 record the specified user as committer

-.UNINDENT

+.RE

 .sp

 [+] marked option can be specified multiple times

 .SS bisect

@@ -535,9 +508,9 @@

 subdivision search of changesets:

 .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

@@ -561,16 +534,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

 .

@@ -578,10 +551,10 @@

 bad:

 .sp

 .nf

-.ft C

+.ft

 hg bisect \-\-good

 hg bisect \-\-bad

-.ft P

+.ft

 .fi

 .IP \(bu 2

 .

@@ -589,10 +562,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

 .

@@ -599,9 +572,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

 .

@@ -608,22 +581,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

 .

@@ -631,9 +604,9 @@

 bisection:

 .sp

 .nf

-.ft C

+.ft

 hg log \-r "bisect(pruned)"

-.ft P

+.ft

 .fi

 .IP \(bu 2

 .

@@ -641,9 +614,9 @@

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

 .sp

 .nf

-.ft C

+.ft

 hg log \-r "bisect(current)"

-.ft P

+.ft

 .fi

 .IP \(bu 2

 .

@@ -650,9 +623,9 @@

 see all changesets that took part in the current bisection:

 .sp

 .nf

-.ft C

+.ft

 hg log \-r "bisect(range)"

-.ft P

+.ft