Searched refs:resolved_diff (Results 1 – 5 of 5) sorted by relevance
55 svn_diff_t **diff_ref = &hunk->resolved_diff; in svn_diff__resolve_conflict()90 hunk->resolved_diff = NULL; in svn_diff__resolve_conflict()213 (*diff_ref)->resolved_diff = NULL; in svn_diff__resolve_conflict()234 (*diff_ref)->resolved_diff = NULL; in svn_diff__resolve_conflict()448 (*diff_ref)->resolved_diff = NULL; in svn_diff_diff3_2()491 (*diff_ref)->resolved_diff = NULL; in svn_diff_diff3_2()
59 svn_diff_t *resolved_diff; member
122 diff->resolved_diff)); in svn_diff_output2()
376 svn_diff_t *resolved_diff);
826 svn_diff_t *resolved_diff) in file_merge_output_conflict() argument