Revision 1687456

Remove the svn_client_conflict_get_merged_file() macro.

The merged file is now only used for text conflicts, where it always equals
the local_abspath of the conflicted file. So the resolver can use the file's
local_abspath instead.

* subversion/include/svn_client.h
  (svn_client_conflict_get_merged_file): Remove.

* subversion/svn/conflict-callbacks.c
  (handle_text_conflict, conflict_func_interactive): Use file's local_abspath
   instead of merged_file.