diff3_op
class diff3_op
Methods
__construct($orig = false, $final1 = false, $final2 = 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
_compare_conflict_seq($orig, $final1, $final2 = false)
Find code portions from $orig in $final1 and use $final2 as merged instance if provided
solve_conflict()
Tries to solve conflicts aggressively based on typical "assumptions"
Details
at line 763
__construct($orig = false, $final1 = false, $final2 = false)
No description
at line 770
merged()
No description
at line 800
is_conflict()
No description
at line 809
solve_prepare()
Function to prepare the arrays for comparing - we want to skip over newline changes
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
at line 898
solve_conflict()
Tries to solve conflicts aggressively based on typical "assumptions"