Class Text_Diff3

Description
Description | Vars (details) | Methods (details)

A class for computing three way diffs.

$Horde: framework/Text_Diff/Diff3.php,v 1.4 2005/07/03 05:10:11 selsky Exp $

Located in /sources/diff.php (line 451) 

Text_Diff
   |
   --Text_Diff3
Variable Summary
Description | Vars (details) | Methods (details)
integer $_conflictingBlocks
Method Summary
Description | Vars (details) | Methods (details)
Text_Diff3 Text_Diff3 (array $orig, array $final1, array $final2)
void mergedOutput ([ $label1 = false], [ $label2 = false])
Variables
Description | Vars (details) | Methods (details)
integer $_conflictingBlocks (line 458)

Conflict counter.

Inherited Variables

Inherited from Text_Diff

Text_Diff::$_edits
Methods
Description | Vars (details) Methods (details)
Constructor Text_Diff3 (line 467)

Computes diff between 3 sequences of strings.

Text_Diff3 Text_Diff3 (array $orig, array $final1, array $final2)
  • array $orig: The original lines to use.
  • array $final1: The first version to compare to.
  • array $final2: The second version to compare to.
mergedOutput (line 475)
void mergedOutput ([ $label1 = false], [ $label2 = false])
  • $label1
  • $label2

Inherited Methods

Inherited From Text_Diff

Text_Diff::Text_Diff()
Text_Diff::getDiff()
Text_Diff::getFinal()
Text_Diff::getOriginal()
Text_Diff::isEmpty()
Text_Diff::lcs()
Text_Diff::reverse()
Text_Diff::trimNewlines()
Text_Diff::_check()

Documentation generated on Sun, 02 Jan 2011 23:13:06 +0000 by phpDocumentor 1.4.3