A "Merge Changeset" button (green arrow) will appear in Source Control Explorer that allows you to enter a changeset number. Then you can select a target branch from the related set of branches. After the merge, Pending Changes will be shown and the TFS associated work item will be added automatically. If there are any conflicts, the resolve conflicts tab will appear.
Version 1.5
Added prompt if no changes were merged, and does not add work items and comment in that case.
Version 1.4
Added better error handling when an invalid changeset number is specified.
Version 1.3
Adds check-in comment automatically containing that it is a merge including source and target branch names.
Version 1.2
Fixed resolve conflicts tab showing conflicts that should have been autoresolved.
Version 1.1
Fixed resolve conflicts tab showing when there were no conflicts.
