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

help: describe more detail about capabilities while deciding merge tool

"hg help merge-tools" describes as below:

    (internal merge tools) will by default not handle symlinks or
    binary files.

But in some cases, Mercurial assumes that internal merge tools have
one or both of these capabilities.

"hg help merge-tools" also describes as below, for matching patterns in
merge-patterns configuration section. But this is not sufficient.

    Here, binary capabilities of the merge tool are not considered.

This patch describes more detail about capabilities while deciding
merge tool.
parent d7007b80
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment