Combine the two helper functions that used to be part of merge_props_changed. The improved error handling in the callers allowed moving the middle portion out, and now combining the rest.
Combine the two helper functions that used to be part of merge_props_changed.
The improved error handling in the callers allowed moving the middle portion
out, and now combining the rest.

* subversion/libsvn_client/merge.c
  (prepare_merge_props_changed): Directly handle the code from...
  (record_mergeinfo_prop_change): ... this function without introducing
    another call in both callers.
  (merge_dir_props_changed,
   merge_file_changed): Update callers.

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