How does the 3 way merge in Mercurial/Meld work?

Question

I\'m working on a project where I have a commit that introduced a feature with major problems that weren\'t discovered immediately. Now I want to completely remove that revision

Answer 1

Local is r133

Other is r134

Base is r128 (the common ancestor to both r133 and r 134)

When you perform a 3 way merge it compares all three of those together to help you decide what to take and from where. By seeing what change is in the other revision and what the common ancestor looked like you are able to make a much more informed decision about what to keep and what to change.