dummy merge (two branches) for dummies

[Matt Mackall]

On Thu, 2016-08-18 at 12:23 +0000, Uwe Brauer wrote:
> 
> hg merge --tool internal:other foo

Again, this is not the important bit.

It only affects files that were changed on both sides: files with merge
conflicts. Changes to files that don't cause conflicts will still be present,
which you don't want. 

Really, it's this simple:

- check out the branch you want
- merge with the branch you don't want
- discard all the changes from that merge with revert <- the important bit
- check in the result

The debugsetparents trick works, but is much more mysterious.

-- 
Mathematics is the supreme nostalgia of our time.