Mercurial > public > mercurial-scm > hg-stable

diff mercurial/help/merge-tools.txt @ 39163:e09fad982ef5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: show actual capabilities of internal merge tools This information is useful to know which internal merge tools can be applied safely on binary files and/or symlinks.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Tue, 14 Aug 2018 22:20:28 +0900
parents cded904f7acc
children 0dfcc348d383
line wrap: on
line diff
--- a/mercurial/help/merge-tools.txt	Wed Aug 15 22:24:50 2018 +0900
+++ b/mercurial/help/merge-tools.txt	Tue Aug 14 22:20:28 2018 +0900
@@ -36,8 +36,9 @@
 
 .. internaltoolsmarker
 
-Internal tools are always available and do not require a GUI but will by default
-not handle symlinks or binary files.
+Internal tools are always available and do not require a GUI but will
+by default not handle symlinks or binary files. See next section for
+detail about "actual capabilities" described above.
 
 Choosing a merge tool
 =====================