MergeJobConflictSubFile Enum

Summary

This enum is used by MergeJobConflict to get paths to and contents of the sub-files for a merge conflict.
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["MergeJobConflictSubFile"] class Type type-node

Syntax

public enum MergeJobConflictSubFile

Fields

Name Constant Value Summary
Base 0
This is the base file, the common ancestor of both Local and Other.
static
Current 3
The current file, as present in the working directory. This is the one that will be kept if the file is marked as resolved.
static
Local 1
The local version of the file, the one that was present in the working folder before the merge was initiated.
static
Other 2
The other version of the file, the one that came from the branch that the merge is attempting to merge in.
static