Mercurial > hg
changeset 12838:830be2c57626 stable
help: improve wording of internal:merge and internal:fail
| author | Steve Borho <steve@borho.org> |
|---|---|
| date | Mon, 25 Oct 2010 14:34:49 -0500 |
| parents | c82056f2509f |
| children | d85e30889f26 |
| files | mercurial/help/merge-tools.txt |
| diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/help/merge-tools.txt Mon Oct 25 11:29:32 2010 -0500 +++ b/mercurial/help/merge-tools.txt Mon Oct 25 14:34:49 2010 -0500 @@ -35,13 +35,14 @@ merge tools are: ``internal:merge`` - Uses the internal non-interactive simple merge algorithm for merging files. - It will fail if there are any conflicts. + Uses the internal non-interactive simple merge algorithm for merging + files. It will fail if there are any conflicts and leave markers in + the partially merged file. ``internal:fail`` Rather than attempting to merge files that were modified on both - branches, it marks these files as unresolved. Then the resolve - command must be used to mark files resolved. + branches, it marks them as unresolved. The resolve command must be + used to resolve these conflicts. ``internal:local`` Uses the local version of files as the merged version.