Searched refs:do_text_merge (Results 1 - 2 of 2) sorted by relevance
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/ |
| H A D | merge.c | 387 do_text_merge(svn_boolean_t *contains_conflicts,
438 /* Same as do_text_merge() above, but use the external diff3
869 SVN_ERR(do_text_merge(&contains_conflicts,
386 do_text_merge(svn_boolean_t *contains_conflicts, function
|
| H A D | wc_db_update_move.c | 1466 svn_boolean_t do_text_merge,
1596 if (do_text_merge)
1459 tc_editor_update_incoming_moved_file(node_move_baton_t *nmb, const char *dst_relpath, const char *src_relpath, const svn_checksum_t *src_checksum, const svn_checksum_t *dst_checksum, apr_hash_t *dst_props, apr_hash_t *src_props, svn_boolean_t do_text_merge, apr_pool_t *scratch_pool) argument
|
Completed in 170 milliseconds