ThreeWay
in package
A class for computing three way merges.
Copyright 2007-2017 Horde LLC (http://www.horde.org/)
See the enclosed file LICENSE for license information (LGPL). If you did not receive this file, see http://www.horde.org/licenses/lgpl21.
Tags
Table of Contents
- $_conflictingBlocks : int
- Conflict counter.
- $_edits : array<string|int, mixed>
- Array of changes.
- __construct() : mixed
- Computes diff between 3 sequences of strings.
- fromFileLineArrays() : self
- mergedOutput() : mixed
- _diff3() : mixed
Properties
$_conflictingBlocks
Conflict counter.
protected
int
$_conflictingBlocks
= 0
$_edits
Array of changes.
protected
array<string|int, mixed>
$_edits
Methods
__construct()
Computes diff between 3 sequences of strings.
public
__construct(OperationList $origFinal1, OperationList $origFinal2) : mixed
Parameters
- $origFinal1 : OperationList
- $origFinal2 : OperationList
Return values
mixed —fromFileLineArrays()
public
static fromFileLineArrays(array<string|int, mixed> $original, array<string|int, mixed> $final1, array<string|int, mixed> $final2[, string $engine = "auto" ]) : self
Parameters
- $original : array<string|int, mixed>
- $final1 : array<string|int, mixed>
- $final2 : array<string|int, mixed>
- $engine : string = "auto"
Return values
self —mergedOutput()
public
mergedOutput([mixed $label1 = false ][, mixed $label2 = false ]) : mixed
Parameters
- $label1 : mixed = false
- $label2 : mixed = false
Return values
mixed —_diff3()
protected
_diff3(mixed $edits1, mixed $edits2) : mixed
Parameters
- $edits1 : mixed
- $edits2 : mixed