IT:AD:BeyondCompare:HowTo:3-Way Merge
Situation
You've just done a Get Latest Version (GLV) from the repository and TFS or Mercurial is stating that you have Conflicts.
You choose Tool Compare.
Up pops Beyond Compare.
Solution
You have 3 screens.
The Center one is a previous copy, that you can use as the baseline to determine what's going on with the new version.
The left one