Revision 1161219

Auto-resolve 'local move vs. incoming edit' conflicts for files during merge.

* subversion/libsvn_client/repos_diff.c
  (close_file): If the file did receive changes during the merge
   and has been moved-away, show the file's new location during
   notification.

* subversion/libsvn_client/merge.c
  (merge_file_changed): If the file being merged into was
   moved away locally, merge incoming changes to the file
   at the new location.

* subversion/tests/cmdline/tree_conflict_tests.py
  (merge_file_mod_onto_not_file): Don't expect a tree conflict
   for locally moved files.