Searched refs:do_text_merge (Results 1 – 8 of 8) sorted by relevance
| /dports/java/java-subversion/subversion-1.14.1/subversion/libsvn_wc/ |
| H A D | merge.c | 386 do_text_merge(svn_boolean_t *contains_conflicts, in do_text_merge() function
868 SVN_ERR(do_text_merge(&contains_conflicts, in merge_text_file()
|
| H A D | wc_db_update_move.c | 1466 svn_boolean_t do_text_merge, in tc_editor_update_incoming_moved_file() argument
1596 if (do_text_merge) in tc_editor_update_incoming_moved_file()
|
| /dports/devel/py-subversion/subversion-1.14.1/subversion/libsvn_wc/ |
| H A D | merge.c | 386 do_text_merge(svn_boolean_t *contains_conflicts, in do_text_merge() function
868 SVN_ERR(do_text_merge(&contains_conflicts, in merge_text_file()
|
| H A D | wc_db_update_move.c | 1466 svn_boolean_t do_text_merge, in tc_editor_update_incoming_moved_file() argument
1596 if (do_text_merge) in tc_editor_update_incoming_moved_file()
|
| /dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/libsvn_wc/ |
| H A D | merge.c | 386 do_text_merge(svn_boolean_t *contains_conflicts, in do_text_merge() function
868 SVN_ERR(do_text_merge(&contains_conflicts, in merge_text_file()
|
| H A D | wc_db_update_move.c | 1466 svn_boolean_t do_text_merge, in tc_editor_update_incoming_moved_file() argument
1596 if (do_text_merge) in tc_editor_update_incoming_moved_file()
|
| /dports/devel/p5-subversion/subversion-1.14.1/subversion/libsvn_wc/ |
| H A D | merge.c | 386 do_text_merge(svn_boolean_t *contains_conflicts, in do_text_merge() function
868 SVN_ERR(do_text_merge(&contains_conflicts, in merge_text_file()
|
| H A D | wc_db_update_move.c | 1466 svn_boolean_t do_text_merge, in tc_editor_update_incoming_moved_file() argument
1596 if (do_text_merge) in tc_editor_update_incoming_moved_file()
|