Home
last modified time | relevance | path

Searched refs:svn_wc_conflict_choice_t (Results 1 – 8 of 8) sorted by relevance

/freebsd-13-stable/contrib/subversion/subversion/libsvn_client/
HDresolved.c110 svn_wc_conflict_choice_t conflict_choice, in svn_client_resolve()
HDconflicts.c157 static svn_wc_conflict_choice_t
6410 svn_wc_conflict_choice_t conflict_choice; in resolve_text_conflict()
6447 svn_wc_conflict_choice_t conflict_choice; in resolve_prop_conflict()
/freebsd-13-stable/contrib/subversion/subversion/include/private/
HDsvn_wc_private.h1794 svn_wc_conflict_choice_t conflict_choice,
1813 svn_wc_conflict_choice_t choice,
1833 svn_wc_conflict_choice_t choice,
/freebsd-13-stable/contrib/subversion/subversion/libsvn_wc/
HDconflicts.c1605 svn_wc_conflict_choice_t choice, in build_text_conflict_resolve_items()
1875 svn_wc_conflict_choice_t conflict_choice,
2432 svn_wc_conflict_choice_t conflict_choice, in resolve_prop_conflict_on_node()
2689 svn_wc_conflict_choice_t conflict_choice, in resolve_tree_conflict_on_node()
2976 svn_wc_conflict_choice_t conflict_choice;
3048 svn_wc_conflict_choice_t my_choice = cswb->conflict_choice; in conflict_status_walker()
3203 svn_wc_conflict_choice_t conflict_choice, in svn_wc__resolve_conflicts()
3361 svn_wc_conflict_choice_t conflict_choice, in svn_wc_resolved_conflict5()
3380 svn_wc_create_conflict_result(svn_wc_conflict_choice_t choice, in svn_wc_create_conflict_result()
3398 svn_wc_conflict_choice_t choice, in svn_wc__conflict_text_mark_resolved()
[all …]
HDdeprecated.c1249 svn_wc_conflict_choice_t conflict_choice, in svn_wc_resolved_conflict4()
1328 svn_wc_conflict_choice_t conflict_choice, in svn_wc_resolved_conflict3()
/freebsd-13-stable/contrib/subversion/subversion/include/
HDsvn_wc.h2163 typedef enum svn_wc_conflict_choice_t enum
2192 } svn_wc_conflict_choice_t; typedef
2209 svn_wc_conflict_choice_t choice;
2245 svn_wc_create_conflict_result(svn_wc_conflict_choice_t choice,
5099 svn_wc_conflict_choice_t conflict_choice,
5121 svn_wc_conflict_choice_t conflict_choice,
5143 svn_wc_conflict_choice_t conflict_choice,
HDsvn_client.h5478 svn_wc_conflict_choice_t conflict_choice,
/freebsd-13-stable/contrib/subversion/subversion/svn/
HDmerge-cmd.c178 svn_wc_conflict_choice_t choice; in conflict_func_merge_cmd()