Summary
This class holds string constants with proper .NET identifiers for the built-in known
merge tools.
- Assembly
- Mercurial
.Net .dll - Namespace
- Mercurial
- Base Types
-
- object
graph TD
Base0["object"]-->Type
Type["MergeTools"]
class Type type-node
Syntax
public static class MergeToolsFields
| Name | Constant Value | Summary |
|---|---|---|
| InternalDump | 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".
static
|
| InternalFail | 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.
static
|
| InternalLocal | internal:local |
Uses the local version of files as the merged version.
static
|
| InternalMerge | 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.
static
|
| InternalOther | internal:other |
Uses the other version of files as the merged version.
static
|
| InternalPrompt | internal:prompt |
Asks the user which of the local or the other version to keep as the merged version.
static
|