Home
last modified time | relevance | path

Searched refs:svn_wc_conflict_choose_merged (Results 1 – 7 of 7) sorted by relevance

/freebsd-10-stable/contrib/subversion/subversion/svn/
Dconflict-callbacks.c429 svn_wc_conflict_choose_merged },
475 svn_wc_conflict_choose_merged },
504 svn_wc_conflict_choose_merged },
519 svn_wc_conflict_choose_merged },
996 if (opt->choice == svn_wc_conflict_choose_merged in handle_text_conflict()
1108 result->choice = svn_wc_conflict_choose_merged; in handle_prop_conflict()
1225 (*result)->choice = svn_wc_conflict_choose_merged; in conflict_func_interactive()
1265 (*result)->choice = svn_wc_conflict_choose_merged; in conflict_func_interactive()
1308 (*result)->choice = svn_wc_conflict_choose_merged; in conflict_func_interactive()
Dresolved-cmd.c76 svn_wc_conflict_choose_merged, in svn_cl__resolved()
Dresolve-cmd.c59 conflict_choice = svn_wc_conflict_choose_merged; in svn_cl__resolve()
/freebsd-10-stable/contrib/subversion/subversion/libsvn_wc/
Dconflicts.c1352 case svn_wc_conflict_choose_merged: in generate_propconflict()
1672 case svn_wc_conflict_choose_merged: in build_text_conflict_resolve_items()
2473 case svn_wc_conflict_choose_merged: in resolve_prop_conflict_on_node()
2650 if (conflict_choice == svn_wc_conflict_choose_merged) in resolve_tree_conflict_on_node()
2782 else if (conflict_choice == svn_wc_conflict_choose_merged) in resolve_tree_conflict_on_node()
2813 if (conflict_choice == svn_wc_conflict_choose_merged) in resolve_tree_conflict_on_node()
2836 if (conflict_choice != svn_wc_conflict_choose_merged) in resolve_tree_conflict_on_node()
2881 svn_wc_conflict_choose_merged, in svn_wc__mark_resolved_text_conflict()
2912 svn_wc_conflict_choose_merged, in svn_wc__mark_resolved_prop_conflicts()
Ddeprecated.c1260 svn_wc_conflict_choose_merged, in svn_wc_resolved_conflict2()
1280 svn_wc_conflict_choose_merged, in svn_wc_resolved_conflict3()
/freebsd-10-stable/contrib/subversion/subversion/include/
Dsvn_wc.h2153 svn_wc_conflict_choose_merged, /**< merged version */ enumerator
/freebsd-10-stable/contrib/subversion/subversion/libsvn_client/
Ddeprecated.c2832 svn_wc_conflict_choose_merged, ctx, pool); in svn_client_resolved()