Mercurial > hg
comparison mercurial/help/merge-tools.txt @ 12858:6eec9d7c6e0f stable
help: fix typo in merge-tools topic
| author | Wagner Bruna <wbruna@yahoo.com> |
|---|---|
| date | Wed, 27 Oct 2010 12:03:08 -0200 |
| parents | 830be2c57626 |
| children | 0c4bec9596d8 |
comparison
equal
deleted
inserted
replaced
| 12857:a9f91c844a3b | 12858:6eec9d7c6e0f |
|---|---|
| 29 application in the executable search path. The tool is assumed to be | 29 application in the executable search path. The tool is assumed to be |
| 30 able to handle the merge if it can handle symlinks if the file is a | 30 able to handle the merge if it can handle symlinks if the file is a |
| 31 symlink, if it can handle binary files if the file is binary, and if a | 31 symlink, if it can handle binary files if the file is binary, and if a |
| 32 GUI is available if the tool requires a GUI. | 32 GUI is available if the tool requires a GUI. |
| 33 | 33 |
| 34 There are a some internal merge tools which can be used. The internal | 34 There are some internal merge tools which can be used. The internal |
| 35 merge tools are: | 35 merge tools are: |
| 36 | 36 |
| 37 ``internal:merge`` | 37 ``internal:merge`` |
| 38 Uses the internal non-interactive simple merge algorithm for merging | 38 Uses the internal non-interactive simple merge algorithm for merging |
| 39 files. It will fail if there are any conflicts and leave markers in | 39 files. It will fail if there are any conflicts and leave markers in |