conflict-helper

Functions

reconstructConflict()

reconstructConflict(merged: any, ours: any, theirs: any, format: string): Promise<string>

Defined in: conflict-helper.ts:31

Build conflict markers into serialized string

Parameters

merged

any

ours

any

theirs

any

format

string

Returns

Promise<string>