mercurial/help/config.txt
branchstable
changeset 23111 0dae9147c3b6
parent 23075 2b3189ec3d14
child 23121 7a3f715dfa90
--- a/mercurial/help/config.txt	Sat Nov 01 02:43:08 2014 +0900
+++ b/mercurial/help/config.txt	Sat Nov 01 02:43:08 2014 +0900
@@ -982,7 +982,8 @@
   launching external tool.  Options are ``true``, ``false``, ``keep`` or
   ``keep-merge3``. The ``keep`` option will leave markers in the file if the
   premerge fails. The ``keep-merge3`` will do the same but include information
-  about the base of the merge in the marker (see internal:merge3).
+  about the base of the merge in the marker (see internal :merge3 in
+  :hg:`help merge-tools`).
   Default: True
 
 ``binary``