diff mercurial/commands.py @ 19997:de16c673455b stable

documentation: add an extra newline after note directive

Like this no docutils version interprets any line in the following text as
argument of note.

--- a/mercurial/commands.py	Mon Nov 04 10:23:06 2013 +0100
+++ b/mercurial/commands.py	Tue Nov 05 08:59:55 2013 +0100
@@ -397,6 +397,7 @@
     changes and the merged result is left uncommitted.
 
     .. note::
+
       backout cannot be used to fix either an unwanted or
       incorrect merge.
 
@@ -937,6 +938,7 @@
     """set or show the current branch name
 
     .. note::
+
        Branch names are permanent and global. Use :hg:`bookmark` to create a
        light-weight bookmark instead. See :hg:`help glossary` for more
        information about named branches and bookmarks.
@@ -2707,6 +2709,7 @@
     Differences between files are shown using the unified diff format.
 
     .. note::
+
        diff may generate unexpected results for merges, as it will
        default to comparing against the working directory's first
        parent changeset if no revisions are specified.
@@ -2796,6 +2799,7 @@
     comment.
 
     .. note::
+
        export may generate unexpected diff output for merge
        changesets, as it will compare the merge changeset against its
        first parent only.
@@ -2928,6 +2932,7 @@
     continued with the -c/--continue option.
 
     .. note::
+
       The -c/--continue option does not reapply earlier options.
 
     .. container:: verbose
@@ -3979,12 +3984,14 @@
     changed files and full commit message are shown.
 
     .. note::
+
        log -p/--patch may generate unexpected diff output for merge
        changesets, as it will only compare the merge changeset against
        its first parent. Also, only files different from BOTH parents
        will appear in files:.
 
     .. note::
+
        for performance reasons, log FILE may omit duplicate changes
        made on branches and will not show deletions. To see all
        changes including duplicates and deletions, use the --removed
@@ -4652,6 +4659,7 @@
     only create a new branch without forcing other changes.
 
     .. note::
+
       Extra care should be taken with the -f/--force option,
       which will push all new heads on all branches, an action which will
       almost always cause confusion for collaborators.
@@ -4976,6 +4984,7 @@
     """restore files to their checkout state
 
     .. note::
+
        To check out earlier revisions, you should use :hg:`update REV`.
        To cancel an uncommitted merge (and lose your changes),
        use :hg:`update --clean .`.
@@ -5306,6 +5315,7 @@
     unless explicitly requested with -u/--unknown or -i/--ignored.
 
     .. note::
+
        status may appear to disagree with diff if permissions have
        changed or a merge has occurred. The standard diff format does
        not report permission changes and diff only reports changes