Summary
This enum is used by
MergeConflict to signal the current (as of last executionof the
ResolveCommand) state of a file that had a merge conflict from the last merge.
- Assembly
- Mercurial
.Net .dll - Namespace
- Mercurial
- Interfaces
-
- IComparable
- IFormattable
- IConvertible
- Base Types
-
- object
- ValueType
- Enum
graph TD
Base0["Enum"]-->Type
Base1["ValueType"]-->Base0
Base2["object"]-->Base1
Interface0["IComparable"]-.->Type
Interface1["IFormattable"]-.->Type
Interface2["IConvertible"]-.->Type
Type["MergeConflictState"]
class Type type-node
Syntax
public enum MergeConflictStateFields
| Name | Constant Value | Summary |
|---|---|---|
| Resolved | 1 |
The file is in a resolved state.
static
|
| Unresolved | 0 |
The file is in an unresolved state.
static
|