The final result returned by svn_wc_conflict_resolver_func_t. More...
#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_boolean_t | save_merged |
| If true, save a backup copy of merged_file (or the original merged_file from the conflict description, if merged_file is NULL) in the user's working copy. | |
The final result returned by svn_wc_conflict_resolver_func_t.
Definition at line 2011 of file svn_wc.h.
| const char* svn_wc_conflict_result_t::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.
libsvn_wc accepts this file if (and only if) choice is set to svn_wc_conflict_choose_merged.
1.6.3