* subversion/libsvn_client/diff.c   (merge_file_added): Move local variables used to localize conflict    marker text down to the block where they're actually used.
* subversion/libsvn_client/diff.c
  (merge_file_added): Move local variables used to localize conflict
   marker text down to the block where they're actually used.

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