#include <svn_wc.h>
Data Fields | |
svn_wc_conflict_choice_t | choice |
A choice to either delay the conflict resolution or select a particular file to resolve the conflict. | |
const char * | merged_file |
If not NULL, this is a path to a file which contains the client's (or more likely, the user's) merging of the three values in conflict. |
svn_wc_create_conflict_result()
below.
Definition at line 1187 of file svn_wc.h.
const char* svn_wc_conflict_result_t::merged_file |