* subversion/libsvn_client/merge.c
  (single_file_merge_get_file): Store temp files where 'svn diff' does: in
    the temp dir.
  (do_file_merge): Update caller.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1439007 13f79535-47bb-0310-9956-ffa450edef68