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.