Write merge conflict markers in the encoding of the current locale instead of UTF8.
Write merge conflict markers in the encoding of the current locale instead of
UTF8.

* subversion/libsvn_diff/diff_file.c
  (svn_diff3__file_output_baton_t): Add comment about the encoding of four
  string members.
  (svn_diff_file_output_merge): Store the conflict marker strings in the locale
  encoding in the baton.


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

wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion