tag: more merge logic tweaks; new watchMergeDiscussions pref

- The location where the merge discussion will be started is now shown
in the UI.
- Clearer edit summary for merge discussions.
There is still more work to do to fix this feature.