| /freebsd-12.1/contrib/subversion/subversion/libsvn_client/ |
| H A D | switch.c | 108 const char *diff3_cmd; in switch_internal() local
132 svn_config_get(cfg, &diff3_cmd, SVN_CONFIG_SECTION_HELPERS, in switch_internal()
135 if (diff3_cmd != NULL) in switch_internal()
136 SVN_ERR(svn_path_cstring_to_utf8(&diff3_cmd, diff3_cmd, pool)); in switch_internal()
315 diff3_cmd, preserved_exts, in switch_internal()
|
| H A D | update.c | 235 const char *diff3_cmd; in update_internal() local
343 svn_config_get(cfg, &diff3_cmd, SVN_CONFIG_SECTION_HELPERS, in update_internal()
346 if (diff3_cmd != NULL) in update_internal()
347 SVN_ERR(svn_path_cstring_to_utf8(&diff3_cmd, diff3_cmd, scratch_pool)); in update_internal()
473 diff3_cmd, preserved_exts, in update_internal()
|
| H A D | externals.c | 460 const char *diff3_cmd; in switch_file_external() local
473 svn_config_get(cfg, &diff3_cmd, SVN_CONFIG_SECTION_HELPERS, in switch_file_external()
476 if (diff3_cmd != NULL) in switch_file_external()
477 SVN_ERR(svn_path_cstring_to_utf8(&diff3_cmd, diff3_cmd, scratch_pool)); in switch_file_external()
572 diff3_cmd, preserved_exts, in switch_file_external()
|
| H A D | merge.c | 295 const char *diff3_cmd; member
2131 merge_b->dry_run, merge_b->diff3_cmd, in merge_file_changed()
9792 const char *diff3_cmd; in do_merge() local
9848 svn_config_get(cfg, &diff3_cmd, SVN_CONFIG_SECTION_HELPERS, in do_merge()
9851 if (diff3_cmd != NULL) in do_merge()
9852 SVN_ERR(svn_path_cstring_to_utf8(&diff3_cmd, diff3_cmd, scratch_pool)); in do_merge()
9873 merge_cmd_baton.diff3_cmd = diff3_cmd; in do_merge()
|
| /freebsd-12.1/contrib/subversion/subversion/libsvn_wc/ |
| H A D | merge.c | 53 const char *diff3_cmd; /* The diff3 command and options */ member
443 const char *diff3_cmd, in do_text_merge_external() argument
458 result_f, diff3_cmd, in do_text_merge_external()
855 if (mt->diff3_cmd) in merge_text_file()
858 mt->diff3_cmd, in merge_text_file()
1091 const char *diff3_cmd, in svn_wc__internal_merge() argument
1117 mt.diff3_cmd = diff3_cmd; in svn_wc__internal_merge()
1133 (! is_binary) && diff3_cmd != NULL, in svn_wc__internal_merge()
1217 const char *diff3_cmd, in svn_wc_merge5() argument
1356 diff3_cmd, in svn_wc_merge5()
|
| H A D | deprecated.c | 3659 if (diff3_cmd) in svn_wc_get_update_editor3()
3660 SVN_ERR(svn_path_cstring_to_utf8(&diff3_cmd, diff3_cmd, pool)); in svn_wc_get_update_editor3()
3844 if (diff3_cmd) in svn_wc_get_switch_editor3()
3845 SVN_ERR(svn_path_cstring_to_utf8(&diff3_cmd, diff3_cmd, pool)); in svn_wc_get_switch_editor3()
4543 const char *diff3_cmd, in svn_wc_merge4() argument
4565 diff3_cmd, in svn_wc_merge4()
4584 const char *diff3_cmd, in svn_wc_merge3() argument
4605 if (diff3_cmd) in svn_wc_merge3()
4606 SVN_ERR(svn_path_cstring_to_utf8(&diff3_cmd, diff3_cmd, pool)); in svn_wc_merge3()
4619 diff3_cmd, in svn_wc_merge3()
[all …]
|
| H A D | wc.h | 416 const char *diff3_cmd,
676 const char *diff3_cmd,
|
| H A D | update_editor.c | 224 const char *diff3_cmd; member
3854 const char *diff3_cmd, in svn_wc__perform_file_merge() argument
3932 diff3_cmd, NULL, propchanges, in svn_wc__perform_file_merge()
4092 eb->diff3_cmd, in merge_file()
4885 const char *diff3_cmd, in make_editor() argument
4957 eb->diff3_cmd = diff3_cmd; in make_editor()
5163 const char *diff3_cmd, in svn_wc__get_update_editor() argument
5188 diff3_cmd, preserved_exts, editor, edit_baton, in svn_wc__get_update_editor()
5206 const char *diff3_cmd, in svn_wc__get_switch_editor() argument
5235 diff3_cmd, preserved_exts, in svn_wc__get_switch_editor()
|
| H A D | externals.c | 1064 const char *diff3_cmd, in svn_wc__get_file_external_editor() argument
1105 eb->diff3cmd = diff3_cmd; in svn_wc__get_file_external_editor()
|
| /freebsd-12.1/contrib/subversion/subversion/include/ |
| H A D | svn_wc.h | 5887 const char *diff3_cmd,
5944 const char *diff3_cmd,
5996 const char *diff3_cmd,
6138 const char *diff3_cmd,
7024 const char *diff3_cmd,
7057 const char *diff3_cmd,
7091 const char *diff3_cmd,
7115 const char *diff3_cmd,
7135 const char *diff3_cmd,
7395 const char *diff3_cmd,
[all …]
|
| H A D | svn_io.h | 2133 const char *diff3_cmd,
2154 const char *diff3_cmd,
2173 const char *diff3_cmd,
|
| /freebsd-12.1/contrib/subversion/subversion/libsvn_subr/ |
| H A D | deprecated.c | 730 const char *diff3_cmd, in svn_io_run_diff3_2() argument
734 SVN_ERR(svn_path_cstring_to_utf8(&diff3_cmd, diff3_cmd, pool)); in svn_io_run_diff3_2()
740 diff3_cmd, user_args, pool)); in svn_io_run_diff3_2()
753 const char *diff3_cmd, in svn_io_run_diff3() argument
759 merged, diff3_cmd, NULL, pool)); in svn_io_run_diff3()
|
| H A D | io.c | 3330 const char *diff3_cmd, in svn_io_run_diff3_3() argument
3353 args[i++] = diff3_cmd; in svn_io_run_diff3_3()
3420 SVN_ERR(svn_io_run_cmd(dir, diff3_cmd, args, in svn_io_run_diff3_3()
3434 svn_dirent_local_style(diff3_cmd, pool), in svn_io_run_diff3_3()
|
| /freebsd-12.1/contrib/subversion/subversion/include/private/ |
| H A D | svn_wc_private.h | 79 const char *diff3_cmd,
1485 const char *diff3_cmd,
1527 const char *diff3_cmd,
|