In the conflict resolver, fix the locating of move targets in the working copy during merges. The previous implementation only worked for update/switch, because it assumed that a move target's revision would always match the incoming-new revision of the conflict victim. This was a design mistake, since this condition won't hold for merges.
* subversion/libsvn_client/conflicts.c (follow_move_chains): Move target candidates from libsvn_wc are now identified only by URL. So check ancestry between the conflict victim and each move target candiate in case their revisions do not match. Add 'victim_repos_relpath' parameter. (init_wc_move_targets, configure_option_local_move_file_merg): Pass the victim's repos relpath to follow_move_chains().