PHP Class Horde_Text_Diff_ThreeWay_Op_Base, horde

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])
Show file Open project: horde/horde

Public Methods

Method Description
__construct ( $orig = false, $final1 = false, $final2 = false )
isConflict ( )
merged ( )

Method Details

__construct() public method

public __construct ( $orig = false, $final1 = false, $final2 = false )

isConflict() public method

public isConflict ( )

merged() public method

public merged ( )