Revision 1667258

Avoid a db operation for each property conflict in some invocations of
the interactive conflict resolver.

* subversion/libsvn_wc/conflicts.c
  (generate_propconflict): Add kind argument.
  (svn_wc__conflict_invoke_resolver): Update caller. Add argument.

* subversion/libsvn_wc/conflicts.h
  (svn_wc__conflict_invoke_resolver): Add kind argument.

* subversion/libsvn_wc/merge.c
  (svn_wc_merge5): Extend scope of variable. Update caller.

* subversion/libsvn_wc/props.c
  (svn_wc_merge_props3): Update caller.

* subversion/libsvn_wc/update_editor.c
  (delete_entry,
   close_directory,
   absent_node,
   close_file): Update caller.