Home
last modified time | relevance | path

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

/NextBSD/contrib/subversion/subversion/libsvn_wc/
HDmerge.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()
HDdeprecated.c3545 const char *diff3_cmd, in svn_wc_get_update_editor4()
3599 const char *diff3_cmd, in svn_wc_get_update_editor3()
3669 const char *diff3_cmd, in svn_wc_get_update_editor2()
3695 const char *diff3_cmd, in svn_wc_get_update_editor()
3731 const char *diff3_cmd, in svn_wc_get_switch_editor4()
3782 const char *diff3_cmd, in svn_wc_get_switch_editor3()
3853 const char *diff3_cmd, in svn_wc_get_switch_editor2()
3882 const char *diff3_cmd, in svn_wc_get_switch_editor()
4289 const char *diff3_cmd, in svn_wc_cleanup2()
4309 const char *diff3_cmd, in svn_wc_cleanup()
[all …]
HDupdate_editor.c224 const char *diff3_cmd; member
3831 const char *diff3_cmd, in svn_wc__perform_file_merge()
4862 const char *diff3_cmd, in make_editor()
5140 const char *diff3_cmd, in svn_wc__get_update_editor()
5183 const char *diff3_cmd, in svn_wc__get_switch_editor()
HDexternals.c1050 const char *diff3_cmd, in svn_wc__get_file_external_editor()
/NextBSD/contrib/subversion/subversion/libsvn_client/
HDswitch.c108 const char *diff3_cmd; in switch_internal() local
HDupdate.c235 const char *diff3_cmd; in update_internal() local
HDexternals.c424 const char *diff3_cmd; in switch_file_external() local
HDmerge.c321 const char *diff3_cmd; member
9762 const char *diff3_cmd; in do_merge() local
/NextBSD/contrib/subversion/subversion/libsvn_subr/
HDdeprecated.c729 const char *diff3_cmd, in svn_io_run_diff3_2()
752 const char *diff3_cmd, in svn_io_run_diff3()
HDio.c3322 const char *diff3_cmd, in svn_io_run_diff3_3()