GME
13
|
#include <svn_wc.h>
Public Attributes | |
svn_wc_conflict_choice_t | choice |
const char * | merged_file |
svn_boolean_t | save_merged |
The final result returned by svn_wc_conflict_resolver_func_t.
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.