Miscellaneous cleanups for libsvn_wc/props.c. * subversion/libsvn_wc/props.c (conflicting_propchanges_p): Rename from svn_wc__conflicting_propchanges_p(), and make static. Document that DESCRIPTION will be NULL if there is no conflict, and make it so. (get_existing_prop_reject_file): Rename from svn_wc__get_existing_prop_reject_file(), and make static. (svn_wc__merge_props): Followup to r17456. Rename local variable 'conflict_description' to 'conflict', and remove dependent boolean variable 'conflict', as the latter can be derived from the former. Update caller of get_existing_prop_reject_file(). (svn_wc__merge_prop_diffs): Move local variable 'conflict_description' into the scope where it's used, and rename to 'conflict', again removing a dependent boolean variable. Update callers of conflicting_propchanges_p() and get_existing_prop_reject_file(). * subversion/libsvn_wc/props.h (svn_wc__conflicting_propchanges_p, svn_wc__get_existing_prop_reject_file): Remove prototypes and doc-comments, as these functions are now static.