Fix a bug where a conflict resolution option was offered under circumstances it cannot handle.
Fix a bug where a conflict resolution option was offered under circumstances
it cannot handle.

Problem exposed by move_tests.py failures.

* subversion/libsvn_clients/conflicts.c
  (svn_client_conflict_tree_get_resolution_options): The option to update
   moved-away nodes can only be used if the incoming change is 'edit'.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1732293 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion