Remove merge_props_changed(), moving the code into its two callers. This makes it easier to observe the output argument behavior of the diff callbacks and will allow integrating the property and text processing in a single atomic wc operation.
Remove merge_props_changed(), moving the code into its two callers. This makes
it easier to observe the output argument behavior of the diff callbacks and
will allow integrating the property and text processing in a single atomic wc
operation.

* subversion/libsvn_client/merge.c
  (prepare_merge_props_changed): Rename argument to result_pool.
  (merge_props_changed): Remove code. Folding code into its callers.
  (merge_dir_props_changed): Update caller.
  (merge_file_changed): Update caller.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion