Skip to content
Snippets Groups Projects
Commit 0dae9147 authored by Katsunori FUJIWARA's avatar Katsunori FUJIWARA
Browse files

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.
parent 692bde7f
Branches
Tags
No related merge requests found
......@@ -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``
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment