Eliminate ### comment: we can't use a straight copy, so de+retranslate the working copy file in a merge operation.
Eliminate ### comment: we can't use a straight copy, so de+retranslate
the working copy file in a merge operation.

NOTE: Reverted in 20352 and reinstated (fixed) in 20387.

* subversion/libsvn_wc/merge.c
  (svn_wc__merge_internal): De+retranslate instead of straight copying.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion