--- a/mercurial/help/merge-tools.txt Mon Jul 23 19:03:32 2012 +0200
+++ b/mercurial/help/merge-tools.txt Wed Jul 25 16:40:38 2012 +0900
@@ -17,7 +17,7 @@
programs but relies on external tools for that.
Available merge tools
-"""""""""""""""""""""
+=====================
External merge tools and their properties are configured in the
merge-tools configuration section - see hgrc(5) - but they can often just
@@ -40,7 +40,7 @@
not handle symlinks or binary files.
Choosing a merge tool
-"""""""""""""""""""""
+=====================
Mercurial uses these rules when deciding which merge tool to use: