mercurial/help/merge-tools.txt
changeset 20532 f1a3ae7c15df
parent 17267 979b107eaea2
child 22707 38e0363dcbe0
--- 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