Mercurial > hg

changeset 23111:0dae9147c3b6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: refer ":merge3" instead of "internal:merge3" According to warning message (introduced by 38e0363dcbe0) in filemerge.py, the former should be used as official name.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sat, 01 Nov 2014 02:43:08 +0900
parents 692bde7f486d
children 3226ed457928
files mercurial/help/config.txt
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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``