Home
last modified time | relevance | path

Searched defs:diff3_cmd (Results 1 – 10 of 10) sorted by relevance

/freebsd-13.1/contrib/subversion/subversion/libsvn_wc/
H A Dmerge.c53 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()
H A Ddeprecated.c3601 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()
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()
4569 const char *diff3_cmd, in svn_wc_merge4()
4610 const char *diff3_cmd, in svn_wc_merge3()
4666 const char *diff3_cmd, in svn_wc_merge2()
[all …]
H A Dupdate_editor.c224 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()
H A Dexternals.c1064 const char *diff3_cmd, in svn_wc__get_file_external_editor()
/freebsd-13.1/contrib/subversion/subversion/libsvn_client/
H A Dswitch.c108 const char *diff3_cmd; in switch_internal() local
H A Dupdate.c317 const char *diff3_cmd; in update_internal() local
H A Dexternals.c460 const char *diff3_cmd; in switch_file_external() local
H A Dmerge.c314 const char *diff3_cmd; member
9858 const char *diff3_cmd; in do_merge() local
/freebsd-13.1/contrib/subversion/subversion/libsvn_subr/
H A Ddeprecated.c1142 const char *diff3_cmd, in svn_io_run_diff3_2()
1165 const char *diff3_cmd, in svn_io_run_diff3()
H A Dio.c3594 const char *diff3_cmd, in svn_io_run_diff3_3()