Patchwork help/config: add blank lines

login
register
mail settings
Submitter timeless@mozdev.org
Date Sept. 4, 2015, 10:28 a.m.
Message ID <d81178dbb90e1f5b3ee4.1441362497@waste.org>
Download mbox | patch
Permalink /patch/10395/
State Superseded
Headers show

Comments

timeless@mozdev.org - Sept. 4, 2015, 10:28 a.m.
# HG changeset patch
# User timeless@mozdev.org
# Date 1441173778 14400
#      Wed Sep 02 02:02:58 2015 -0400
# Node ID d81178dbb90e1f5b3ee453afca2786bff6a48dd0
# Parent  7187f6e923d55cf6b7e6910d24645f303db671ee
help/config: add blank lines
Augie Fackler - Sept. 8, 2015, 4:39 p.m.
On Fri, Sep 04, 2015 at 05:28:17AM -0500, timeless@mozdev.org wrote:
> # HG changeset patch
> # User timeless@mozdev.org
> # Date 1441173778 14400
> #      Wed Sep 02 02:02:58 2015 -0400
> # Node ID d81178dbb90e1f5b3ee453afca2786bff6a48dd0
> # Parent  7187f6e923d55cf6b7e6910d24645f303db671ee
> help/config: add blank lines

queued, thank

>
> diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
> --- a/mercurial/help/config.txt
> +++ b/mercurial/help/config.txt
> @@ -208,6 +208,7 @@
>  ---------
>
>  Defines command aliases.
> +
>  Aliases allow you to define your own commands in terms of other
>  commands (or aliases), optionally including arguments. Positional
>  arguments in the form of ``$1``, ``$2``, etc in the alias definition
> @@ -1445,8 +1446,10 @@
>      The template used to print the commit description next to each conflict
>      marker during merge conflicts. See :hg:`help templates` for the template
>      format.
> +
>      Defaults to showing the hash, tags, branches, bookmarks, author, and
>      the first line of the commit description.
> +
>      If you use non-ASCII characters in names for tags, branches, bookmarks,
>      authors, and/or commit descriptions, you must pay attention to encodings of
>      managed files. At template expansion, non-ASCII characters use the encoding
> _______________________________________________
> 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
@@ -208,6 +208,7 @@ 
 ---------
 
 Defines command aliases.
+
 Aliases allow you to define your own commands in terms of other
 commands (or aliases), optionally including arguments. Positional
 arguments in the form of ``$1``, ``$2``, etc in the alias definition
@@ -1445,8 +1446,10 @@ 
     The template used to print the commit description next to each conflict
     marker during merge conflicts. See :hg:`help templates` for the template
     format.
+
     Defaults to showing the hash, tags, branches, bookmarks, author, and
     the first line of the commit description.
+
     If you use non-ASCII characters in names for tags, branches, bookmarks,
     authors, and/or commit descriptions, you must pay attention to encodings of
     managed files. At template expansion, non-ASCII characters use the encoding