Can someone explain how to use the right-hand pane of the 3-pane merge tool?
When a file needs merging or merges with conflicts, I'd expect to see the file with my changes and the file with the conflicting repository changes (i.e. the latest repository version) displayed either side of the 'merged result' output file. This way I can see and compare my changes with the conflicting repository changes and decide how to resolve the conflicts.
As it is, the right-hand pane (captioned 'Changes from Server') shows the original version of the file I checked out (i.e. before either of the sets of conflicting changes was made). I've never been able to figure out quite how to use this original version when resolving the conflicting changes.
So how's it done?