Searched defs:resolved_diff (Results 1 – 2 of 2) sorted by relevance
59 svn_diff_t *resolved_diff; member
826 svn_diff_t *resolved_diff) in file_merge_output_conflict()