class diff3_op_copy extends diff3_op

Methods

__construct($lines = false)

No description

merged()

No description

is_conflict()

No description

solve_prepare()

Function to prepare the arrays for comparing - we want to skip over newline changes

from  diff3_op
_compare_conflict_seq($orig, $final1, $final2 = false)

Find code portions from $orig in $final1 and use $final2 as merged instance if provided

from  diff3_op
solve_conflict()

Tries to solve conflicts aggressively based on typical "assumptions"

from  diff3_op

Details

at line 1075
__construct($lines = false)

No description

Parameters

$lines

at line 1082
merged()

No description

at line 1087
is_conflict()

No description

in diff3_op at line 809
solve_prepare()

Function to prepare the arrays for comparing - we want to skip over newline changes

in diff3_op at line 849
_compare_conflict_seq($orig, $final1, $final2 = false)

Find code portions from $orig in $final1 and use $final2 as merged instance if provided

Parameters

$orig
$final1
$final2

in diff3_op at line 898
solve_conflict()

Tries to solve conflicts aggressively based on typical "assumptions"