\Horde_Text_Diff_ThreeWay

A class for computing three way merges.

See the enclosed file LICENSE for license information (LGPL). If you did not receive this file, see http://www.horde.org/licenses/lgpl21.

Summary

Methods

Properties

Constants

__construct()
mergedOutput()

No public properties found

No constants found

_diff3()

$_edits
$_conflictingBlocks

N/A

No private methods found

No private properties found

N/A

$_edits : array

Array of changes.

array

$_conflictingBlocks : integer

Conflict counter.

integer

__construct(array  $orig, array  $final1, array  $final2)

Computes diff between 3 sequences of strings.

array	$orig	The original lines to use.
array	$final1	The first version to compare to.
array	$final2	The second version to compare to.

mergedOutput(  $label1 = false,   $label2 = false)

	$label1
	$label2

_diff3(  $edits1,   $edits2)

	$edits1
	$edits2