Add a failing test for "incoming edit vs local edit" tree conflict resolution upon merge.
Add a failing test for "incoming edit vs local edit" tree conflict resolution
upon merge.

The test expects to see an option that would apply the incoming change to
the local (to the branch history) move destination.  Currently, we only
offer "(p) postpone" and the "(r) accept current working copy state"
options.

* subversion/tests/libsvn_client/conflicts-test.c
  (test_merge_incoming_edit_file_moved_away): New failing test.
  (test_funcs): Reference new test.


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

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