##// END OF EJS Templates
help: refer ":merge3" instead of "internal:merge3"...
FUJIWARA Katsunori -
r23111:0dae9147 stable
parent child Browse files
Show More
@@ -982,7 +982,8 Supported arguments:
982 launching external tool. Options are ``true``, ``false``, ``keep`` or
982 launching external tool. Options are ``true``, ``false``, ``keep`` or
983 ``keep-merge3``. The ``keep`` option will leave markers in the file if the
983 ``keep-merge3``. The ``keep`` option will leave markers in the file if the
984 premerge fails. The ``keep-merge3`` will do the same but include information
984 premerge fails. The ``keep-merge3`` will do the same but include information
985 about the base of the merge in the marker (see internal:merge3).
985 about the base of the merge in the marker (see internal :merge3 in
986 :hg:`help merge-tools`).
986 Default: True
987 Default: True
987
988
988 ``binary``
989 ``binary``
General Comments 0
You need to be logged in to leave comments. Login now