diff options
Diffstat (limited to 'mercurial/help/merge-tools.txt')
| -rw-r--r-- | mercurial/help/merge-tools.txt | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/mercurial/help/merge-tools.txt b/mercurial/help/merge-tools.txt index b7ed1ea..7324fe4 100644 --- a/mercurial/help/merge-tools.txt +++ b/mercurial/help/merge-tools.txt @@ -17,7 +17,7 @@ conflict markers. Mercurial does not include any interactive merge programs but relies on external tools for that. Available merge tools -===================== +""""""""""""""""""""" External merge tools and their properties are configured in the merge-tools configuration section - see hgrc(5) - but they can often just @@ -34,13 +34,39 @@ GUI is available if the tool requires a GUI. There are some internal merge tools which can be used. The internal merge tools are: -.. internaltoolsmarker +``internal:merge`` + 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 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. + +``internal:other`` + Uses the other version of files as the merged version. + +``internal:prompt`` + Asks the user which of the local or the other version to keep as + the merged version. + +``internal:dump`` + Creates three versions of the files to merge, containing the + contents of local, other and base. These files can then be used to + perform a merge manually. If the file to be merged is named + ``a.txt``, these files will accordingly be named ``a.txt.local``, + ``a.txt.other`` and ``a.txt.base`` and they will be placed in the + same directory as ``a.txt``. Internal tools are always available and do not require a GUI but will by default not handle symlinks or binary files. Choosing a merge tool -===================== +""""""""""""""""""""" Mercurial uses these rules when deciding which merge tool to use: |