Overview

Packages

  • Text
    • Diff

Classes

  • Horde_Text_Diff
  • Horde_Text_Diff_Engine_Native
  • Horde_Text_Diff_Engine_Shell
  • Horde_Text_Diff_Engine_String
  • Horde_Text_Diff_Engine_Xdiff
  • Horde_Text_Diff_Exception
  • Horde_Text_Diff_Mapped
  • Horde_Text_Diff_Op_Add
  • Horde_Text_Diff_Op_Base
  • Horde_Text_Diff_Op_Change
  • Horde_Text_Diff_Op_Copy
  • Horde_Text_Diff_Op_Delete
  • Horde_Text_Diff_Renderer
  • Horde_Text_Diff_Renderer_Context
  • Horde_Text_Diff_Renderer_Inline
  • Horde_Text_Diff_Renderer_Unified
  • Horde_Text_Diff_ThreeWay
  • Horde_Text_Diff_ThreeWay_BlockBuilder
  • Horde_Text_Diff_ThreeWay_Op_Base
  • Horde_Text_Diff_ThreeWay_Op_Copy
  • Overview
  • Package
  • Class
  • Tree

Class Horde_Text_Diff_ThreeWay

A class for computing three way merges.

Copyright 2007-2012 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.

Package: Text\Diff
Author: Geoffrey T. Dairiki dairiki@dairiki.org
Located at Horde/Text/Diff/ThreeWay.php
Methods summary
public
# __construct( array $orig, array $final1, array $final2 )

Computes diff between 3 sequences of strings.

Computes diff between 3 sequences of strings.

Parameters

$orig
The original lines to use.
$final1
The first version to compare to.
$final2
The second version to compare to.
public
# mergedOutput( mixed $label1 = false, mixed $label2 = false )
API documentation generated by ApiGen