Class Text_Diff3

Description

A class for computing three way diffs.

Located in /Text_Diff/Diff3.php (line 25)

Text_Diff
   |
   --Text_Diff3
Variable Summary
Method Summary
 Text_Diff3 Text_Diff3 (array $orig, array $final1, array $final2)
 void mergedOutput ([ $label1 = false], [ $label2 = false])
Variables
integer $_conflictingBlocks = 0 (line 32)

Conflict counter.

Inherited Variables

Inherited from Text_Diff

Text_Diff::$_edits
Methods
Constructor Text_Diff3 (line 41)

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 55)
void mergedOutput ([ $label1 = false], [ $label2 = false])
  • $label1
  • $label2

Inherited Methods

Inherited From Text_Diff

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

Documentation generated on Sun, 30 Jan 2011 05:16:48 +0000 by phpDocumentor 1.4.3