ThreeWayCopyOperation
extends ThreeWayBaseOperation
in package
Copyright 2007-2017 Horde LLC (http://www.horde.org/)
See the enclosed file LICENSE for license information (LGPL). If you did not receive this file, see http://www.horde.org/licenses/lgpl21.
Tags
Table of Contents
- $_merged : array<string|int, mixed>|false
- $final1 : array<string|int, mixed>
- $final2 : array<string|int, mixed>
- $orig : array<string|int, mixed>
- __construct() : mixed
- getFinal1() : mixed
- getFinal2() : mixed
- getOrig() : mixed
- isConflict() : mixed
- merged() : mixed
- norig() : int
Properties
$_merged
protected
array<string|int, mixed>|false
$_merged
$final1
protected
array<string|int, mixed>
$final1
$final2
protected
array<string|int, mixed>
$final2
$orig
protected
array<string|int, mixed>
$orig
Methods
__construct()
public
__construct([array<string|int, mixed> $lines = [] ]) : mixed
Parameters
- $lines : array<string|int, mixed> = []
Return values
mixed —getFinal1()
public
getFinal1() : mixed
Return values
mixed —getFinal2()
public
getFinal2() : mixed
Return values
mixed —getOrig()
public
getOrig() : mixed
Return values
mixed —isConflict()
public
isConflict() : mixed
Return values
mixed —merged()
public
merged() : mixed
Return values
mixed —norig()
public
norig() : int