Searched defs:diff3_cmd (Results 1 – 10 of 10) sorted by relevance
| /freebsd-12-stable/contrib/subversion/subversion/libsvn_wc/ |
| D | merge.c | 53 const char *diff3_cmd; /* The diff3 command and options */ member
443 const char *diff3_cmd, in do_text_merge_external()
1091 const char *diff3_cmd, in svn_wc__internal_merge()
1217 const char *diff3_cmd, in svn_wc_merge5()
|
| D | deprecated.c | 3601 const char *diff3_cmd, in svn_wc_get_update_editor4()
3655 const char *diff3_cmd, in svn_wc_get_update_editor3()
3725 const char *diff3_cmd, in svn_wc_get_update_editor2()
3751 const char *diff3_cmd, in svn_wc_get_update_editor()
3787 const char *diff3_cmd, in svn_wc_get_switch_editor4()
3838 const char *diff3_cmd, in svn_wc_get_switch_editor3()
3909 const char *diff3_cmd, in svn_wc_get_switch_editor2()
3938 const char *diff3_cmd, in svn_wc_get_switch_editor()
4345 const char *diff3_cmd, in svn_wc_cleanup2()
4365 const char *diff3_cmd, in svn_wc_cleanup()
[all …]
|
| D | update_editor.c | 224 const char *diff3_cmd; member
3865 const char *diff3_cmd, in svn_wc__perform_file_merge()
4896 const char *diff3_cmd, in make_editor()
5174 const char *diff3_cmd, in svn_wc__get_update_editor()
5217 const char *diff3_cmd, in svn_wc__get_switch_editor()
|
| D | externals.c | 1064 const char *diff3_cmd, in svn_wc__get_file_external_editor()
|
| /freebsd-12-stable/contrib/subversion/subversion/libsvn_client/ |
| D | switch.c | 108 const char *diff3_cmd; in switch_internal() local
|
| D | update.c | 317 const char *diff3_cmd; in update_internal() local
|
| D | externals.c | 460 const char *diff3_cmd; in switch_file_external() local
|
| D | merge.c | 314 const char *diff3_cmd; member
9858 const char *diff3_cmd; in do_merge() local
|
| /freebsd-12-stable/contrib/subversion/subversion/libsvn_subr/ |
| D | deprecated.c | 1142 const char *diff3_cmd, in svn_io_run_diff3_2()
1165 const char *diff3_cmd, in svn_io_run_diff3()
|
| D | io.c | 3594 const char *diff3_cmd, in svn_io_run_diff3_3()
|