@drupflare/workforce - v0.3.0
Preparing search index...
revisions/merge
mergeText
Function mergeText
mergeText
(
base
:
string
,
ours
:
string
,
theirs
:
string
)
:
MergedText
diff3 over lines, rendered back with conflict markers when both sides touched one
Parameters
base
:
string
ours
:
string
theirs
:
string
Returns
MergedText
Settings
Member Visibility
Protected
Inherited
External
Theme
OS
Light
Dark
@drupflare/workforce - v0.3.0
Loading...
diff3 over lines, rendered back with conflict markers when both sides touched one