Revert r1783879. Again recommend the "move + merge" option during merges.
The "apply edits to old location" resolver option mentioned in the log message of r1783879 has now been implemented. It is in fact handled in a different code path (for "local missing" conflicts, rather than "local deletion"). Which means we can now simply revert r1783879 to see less resolver questions during merges.
* subversion/libsvn_client/conflicts.c (find_operative_moves): Fix the logic which detects operative nested moves to keep a couple of unrelated conflict resolver tests passing; some tests were only passing because this code added *every* move found in the deleted revision. Add only operative moves to the list to fix issue #4766. Note to reviewers: See notes/resolve-moves for definition of "nested move". (reparent_session_and_fetch_node_kind): Remove, now unused.
* subversion/tests/libsvn_client/conflicts-test.c (test_funcs): Issue #4766 test is now passing.