Fix handling of keywords while merging an incoming added file.
Fix handling of keywords while merging an incoming added file.

* subversion/libsvn_client/conflicts.c
  (resolve_merge_incoming_added_file_replace_and_merge): Normalize working
   file content to repository-normal form while copying it. Should fix
   merges with keywords.


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

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