Fix sharing violation error when merging property values with notepad on Windows.
Fix sharing violation error when merging property values with notepad
on Windows.

The error is caused by keeping the file handle open when calling the
extenal editor (editor-cmd).  With notepad, an attempt to save the edited
file results in a sharing violation error upon CreateFile() caused by the
svn process still having the open file handle.

* subversion/svn/conflict-callbacks.c
  (edit_prop_conflict): Take ownership of the apr_file_t when opening a
   stream, so that closing the stream would also close the underlying file.
   Remove the svn_io_file_flush() call, because closing a buffered file
   performs a flush automatically.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1763599 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion