On the diff-callbacks3 branch, correct a few faults detected by
Julian Foad in his review of the first diff committed to this branch.
Review by: julianfoad
* subversion/include/svn_wc.h
(svn_wc_diff_callbacks3_t): Edit comment to clarify the naming of
state variables.
* subversion/libsvn_wc/diff.c
(svn_wc_get_diff_editor2,
svn_wc_diff4): initialize a baton with apr_palloc() because zeroing
out the memory is not required.
* subversion/libsvn_client/merge.c
(merge_dir_opened,
merge_dir_closed): Remove the initialization of an unused variable.
* subversion/libsvn_client/diff.c
(diff_dir_deleted): Restore statements that were unintentionally
deleted by the original diff.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/diff-callbacks3@870485 13f79535-47bb-0310-9956-ffa450edef68
4 files changed
