| Submitter | timeless@mozdev.org |
|---|---|
| Date | Dec. 29, 2015, 5:41 p.m. |
| Message ID | <e177583f1a02f41fd1d4.1451410862@waste.org> |
| Download | mbox | patch |
| Permalink | /patch/12404/ |
| State | Accepted |
| Headers | show |
Comments
On Tue, Dec 29, 2015 at 11:41:02AM -0600, timeless wrote: > # HG changeset patch > # User timeless <timeless@mozdev.org> > # Date 1451401333 0 > # Tue Dec 29 15:02:13 2015 +0000 > # Node ID e177583f1a02f41fd1d47cf98ee445c02979360d > # Parent 9d03acd2fe2e350d1fb3449a4f2543be4a025c08 > help: remove stray double spaces from config help queued these, thanks! > > diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt > --- a/mercurial/help/config.txt > +++ b/mercurial/help/config.txt > @@ -787,7 +787,7 @@ > command line are passed as ``$HG_ARGS``. Parsed command line arguments > are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain string > representations of the data internally passed to <command>. ``$HG_OPTS`` > - is a dictionary of options (with unspecified options set to their > + is a dictionary of options (with unspecified options set to their > defaults). ``$HG_PATS`` is a list of arguments. If the hook returns > failure, the command doesn't execute and Mercurial returns the failure > code. > @@ -1612,7 +1612,7 @@ > username are expanded. > > (default: ``$EMAIL`` or ``username@hostname``. If the username in > - hgrc is empty, e.g. if the system admin set ``username =`` in the > + hgrc is empty, e.g. if the system admin set ``username =`` in the > system hgrc, it has to be specified manually or in a different > hgrc file) > > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@selenic.com > https://selenic.com/mailman/listinfo/mercurial-devel
Patch
diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt --- a/mercurial/help/config.txt +++ b/mercurial/help/config.txt @@ -787,7 +787,7 @@ command line are passed as ``$HG_ARGS``. Parsed command line arguments are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain string representations of the data internally passed to <command>. ``$HG_OPTS`` - is a dictionary of options (with unspecified options set to their + is a dictionary of options (with unspecified options set to their defaults). ``$HG_PATS`` is a list of arguments. If the hook returns failure, the command doesn't execute and Mercurial returns the failure code. @@ -1612,7 +1612,7 @@ username are expanded. (default: ``$EMAIL`` or ``username@hostname``. If the username in - hgrc is empty, e.g. if the system admin set ``username =`` in the + hgrc is empty, e.g. if the system admin set ``username =`` in the system hgrc, it has to be specified manually or in a different hgrc file)