How does the 3 way merge in Mercurial/Meld work?
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 … Read more