Follow up to r5387.
Follow up to r5387.

* subversion/libsvn_client/diff.c
  (do_single_file_merge): Really pass the mime types to merge_file_changed.

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