PHP Class Horde_Text_Diff_ThreeWay, horde

Copyright 2007-2016 Horde LLC (http://www.horde.org/) See the enclosed file COPYING for license information (LGPL). If you did not receive this file, see http://www.horde.org/licenses/lgpl21.

Author: Geoffrey T. Dairiki ([email protected])

Datei anzeigen Open project: horde/horde Class Usage Examples

Protected Properties

Property	Type	Description
$_conflictingBlocks	integer	Conflict counter.
$_edits	array	Array of changes.

Public Methods

Method	Description
__construct ( array $orig, array $final1, array $final2 )	Computes diff between 3 sequences of strings.
mergedOutput ( $label1 = false, $label2 = false )

Protected Methods

Method	Description
_diff3 ( $edits1, $edits2 )

Method Details

__construct() public method

Computes diff between 3 sequences of strings.

public __construct ( array $orig, array $final1, array $final2 )
$orig	array	The original lines to use.
$final1	array	The first version to compare to.
$final2	array	The second version to compare to.

_diff3() protected method

protected _diff3 ( $edits1, $edits2 )

mergedOutput() public method

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

Property Details

$_conflictingBlocks protected_oe property

Conflict counter.

protected int $_conflictingBlocks
return	integer

$_edits protected_oe property

Array of changes.

protected array $_edits
return	array