Mercurial > hg

diff mercurial/help/merge-tools.txt @ 20532:f1a3ae7c15df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: remove last occurrences of ".. note::" without two newlines When we add two newlines after ".. note::" translators will not see this entry. And all versions of docutils interpret this paragraph correctly (details in de16c673455b).
author Simon Heimberg <simohe@besonet.ch>
date Wed, 19 Feb 2014 13:25:28 +0100
parents 979b107eaea2
children 38e0363dcbe0
line wrap: on
line diff
--- a/mercurial/help/merge-tools.txt	Tue Feb 18 14:48:56 2014 -0800
+++ b/mercurial/help/merge-tools.txt	Wed Feb 19 13:25:28 2014 +0100
@@ -73,6 +73,7 @@
 8. The merge of the file fails and must be resolved before commit.
 
 .. note::
+
    After selecting a merge program, Mercurial will by default attempt
    to merge the files using a simple merge algorithm first. Only if it doesn't
    succeed because of conflicting changes Mercurial will actually execute the