* subversion/libsvn_wc/merge.c
(svn_wc_merge): If there was no external merge command specified, use
the internal diff lib to do the merging. Else, fall back to
svn_io_run_diff3.
* subversion/clients/cmdline/cl.h
(svn_cl__longopt_t, svn_cl__opt_state_t): Add merge-cmd option and
placeholder for argument.
* subversion/clients/cmdline/main.c
(svn_cl__option, svn_cl__cmd_table): Add 'diff3-cmd' (merge).
(main): Add 'diff-cmd' (merge) processing. Also override the value of
diff3-cmd in the config if it was passed on the commandline.
* subversion/tests/clients/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Update expected output to current output.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/issue-405-internal-diff@844983 13f79535-47bb-0310-9956-ffa450edef68
4 files changed
