* subversion/libsvn_wc/update_editor.c
  (svn_wc__perform_file_merge): Rename variable to make it clearer that this
    is no temporary path, but a path to a file in the pristine store.


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