On the 'apply-processor' branch: replay revisions r1922335, r1922336 from
'trunk' into the branch.

* r1922335: Format docstrings of merge_cmd_baton_t's fields, so they will be
  represented above the functions.

* r1922336: Declare merge_dir_baton_t and merge_file_baton_t structs as the
  typedefs to themselves.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/apply-processor@1922351 13f79535-47bb-0310-9956-ffa450edef68