Search
Preparing search index...
The search index is not available
DefinitelyTyped
Inherited
Private
Externals
Only exported
git
Merge
Class Merge
Index
Constructor methods
constructor
Properties
STATUS_BOTH
STATUS_OURS
STATUS_THEIRS
conflicts
sections
text
Constructor methods
constructor
(
str
:
string
)
:
Merge
Parameters
str:
string
Returns
Merge
Properties
public
static
STATUS_BOTH
:
string
public
static
STATUS_OURS
:
string
public
static
STATUS_THEIRS
:
string
public
conflicts
:
any
public
sections
:
any
public
text
:
any
Globals
git
Actor
Blame
BlameLine
Blob
Commit
CommitStats
Config
Diff
FileIndex
FileWindow
Git
GitFileOperations
GitIndex
GitObject
Head
LooseStorage
Merge
constructor
STATUS_BOTH
STATUS_OURS
STATUS_THEIRS
conflicts
sections
text
PackStorage
RawObject
Ref
Remote
Repo
Repository
Status
StatusFile
Submodule
Tag
Tree
UserInfo