class diff3_op_copy extends diff3_op
Methods
|
diff3_op($orig = false, $final1 = false, $final2 = false)
|
from diff3_op | |
|
merged()
|
||
|
is_conflict()
|
||
|
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 | |
|
diff3_op_copy($lines = false)
|
Details
in diff3_op at line 757
public
diff3_op($orig = false, $final1 = false, $final2 = false)
at line 1076
public
merged()
at line 1081
public
is_conflict()
in diff3_op at line 803
public
solve_prepare()
Function to prepare the arrays for comparing - we want to skip over newline changes
in diff3_op at line 843
public
_compare_conflict_seq($orig, $final1, $final2 = false)
Find code portions from $orig in $final1 and use $final2 as merged instance if provided
in diff3_op at line 892
public
solve_conflict()
Tries to solve conflicts aggressively based on typical "assumptions"
at line 1069
public
diff3_op_copy($lines = false)