phpBB API Documentation
Class

diff3_op

class diff3_op

Methods

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

merged()

is_conflict()

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 757
public diff3_op($orig = false, $final1 = false, $final2 = false)

Parameters

$orig
$final1
$final2

at line 764
public merged()

at line 794
public is_conflict()

at line 803
public solve_prepare()

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

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

Parameters

$orig
$final1
$final2

at line 892
public solve_conflict()

Tries to solve conflicts aggressively based on typical "assumptions"