* subversion/libsvn_wc/merge.c   (merge_file_trivial): When comparing the working file's content to the    merge-left content, use the detranslated form of the working files's    content. Else, there will be spurious content mismatches in case the    working file has keywords expanded (the merge-left content is in    repository-normal form). Add a new paramter DETRANSLATED_TARGET_ABSPATH    for this purpose.  (svn_wc__internal_merge): Pass down the detranslated_target_abspath to   merge_file_trivial().
* subversion/libsvn_wc/merge.c
  (merge_file_trivial): When comparing the working file's content to the
   merge-left content, use the detranslated form of the working files's
   content. Else, there will be spurious content mismatches in case the
   working file has keywords expanded (the merge-left content is in
   repository-normal form). Add a new paramter DETRANSLATED_TARGET_ABSPATH
   for this purpose.
 (svn_wc__internal_merge): Pass down the detranslated_target_abspath to
  merge_file_trivial().

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