Home
last modified time | relevance | path

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

/freebsd-12.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.c3575 const char *diff3_cmd, in svn_wc_get_update_editor4()
3629 const char *diff3_cmd, in svn_wc_get_update_editor3()
3699 const char *diff3_cmd, in svn_wc_get_update_editor2()
3725 const char *diff3_cmd, in svn_wc_get_update_editor()
3912 const char *diff3_cmd, in svn_wc_get_switch_editor()
4319 const char *diff3_cmd, in svn_wc_cleanup2()
4339 const char *diff3_cmd, in svn_wc_cleanup()
4543 const char *diff3_cmd, in svn_wc_merge4()
4584 const char *diff3_cmd, in svn_wc_merge3()
4640 const char *diff3_cmd, in svn_wc_merge2()
[all …]
H A Dupdate_editor.c224 const char *diff3_cmd; member
3854 const char *diff3_cmd, in svn_wc__perform_file_merge()
4885 const char *diff3_cmd, in make_editor()
5163 const char *diff3_cmd, in svn_wc__get_update_editor()
5206 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-12.1/contrib/subversion/subversion/libsvn_client/
H A Dswitch.c108 const char *diff3_cmd; in switch_internal() local
H A Dupdate.c235 const char *diff3_cmd; in update_internal() local
H A Dexternals.c460 const char *diff3_cmd; in switch_file_external() local
H A Dmerge.c295 const char *diff3_cmd; member
9792 const char *diff3_cmd; in do_merge() local
/freebsd-12.1/contrib/subversion/subversion/libsvn_subr/
H A Ddeprecated.c730 const char *diff3_cmd, in svn_io_run_diff3_2()
753 const char *diff3_cmd, in svn_io_run_diff3()
H A Dio.c3330 const char *diff3_cmd, in svn_io_run_diff3_3()