Mercurial > hg
comparison mercurial/help/merge-tools.txt @ 12826:4d622380ab39 stable
merge-tools.txt: 6 comes after 5
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 24 Oct 2010 18:37:59 +0200 |
parents | 93d6559a9cbc |
children | 830be2c57626 |
comparison
equal
deleted
inserted
replaced
12825:61f48581d8ef | 12826:4d622380ab39 |
---|---|
87 the shell. Otherwise the named tool is used if it is usable. | 87 the shell. Otherwise the named tool is used if it is usable. |
88 | 88 |
89 5. If any usable merge tools are present in the merge-tools configuration | 89 5. If any usable merge tools are present in the merge-tools configuration |
90 section, the one with the highest priority is used. | 90 section, the one with the highest priority is used. |
91 | 91 |
92 5. If a program named ``hgmerge`` can be found on the system, it is used - but | 92 6. If a program named ``hgmerge`` can be found on the system, it is used - but |
93 it will by default not be used for symlinks and binary files. | 93 it will by default not be used for symlinks and binary files. |
94 | 94 |
95 7. If the file to be merged is not binary and is not a symlink, then | 95 7. If the file to be merged is not binary and is not a symlink, then |
96 ``internal:merge`` is used. | 96 ``internal:merge`` is used. |
97 | 97 |