Abstract common code from svn_wc__merge_props() and svn_wc__merge_prop_diffs()
Abstract common code from svn_wc__merge_props() and
svn_wc__merge_prop_diffs()

* subversion/libsvn_wc/props.c
  (open_reject_tmp_file): New helper for creating temporary reject file.
  Abstracted from svn_wc__merge_props().
  (svn_wc__merge_props, svn_wc__merge_prop_diffs): Eliminate slash variable.
  Use open_reject_tmp_file() helper.

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