* subversion/libsvn_wc/merge.c
Merge changes from trunk.
* subversion/libsvn_client/diff.c
(diff_cmd_baton): Ditch the 'cmd' field and merge in the new config
field from trunk.
(diff_file_changed): Merge changes from trunk. Look for a 'diff-cmd'
in the config instead of in the diff_cmd_baton.
(merge_file_changed, merge_file_added): Merge changes from trunk.
adm_access, subpool));
(svn_client_diff): Merge changes from trunk. Drop initialization of
diff_cmd_baton->cmd.
* subversion/clients/cmdline/main.c
(main): Merge changes from trunk. Update the way how we update the
config, since we don't have direct access to it anymore (we need
to get the config from the hash first).
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/issue-405-internal-diff@844979 13f79535-47bb-0310-9956-ffa450edef68
3 files changed
