facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 23:38:50 +03:00
Code Issues Projects Releases Wiki Activity

help: refer ":merge3" instead of "internal:merge3"

Browse Source 
According to warning message (introduced by 727c196b0843) in
filemerge.py, the former should be used as official name.
This commit is contained in:
FUJIWARA Katsunori 2014-11-01 02:43:08 +09:00
parent bf44489048
commit 45bd2bfacb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mercurial/help/config.txt
View File

@ -982,7 +982,8 @@ Supported arguments:
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``