dummy merge (two branches) for dummies

[Uwe Brauer]

Hello

This drives me crazy.
My repo has two branches.
The output of log -G is for example
(I had to abounded the merge maybe this is the reason why both seem to
be active.

@  changeset:   60:9f51f0a1bc8b
|  branch:      foo
|  tag:         tip
|  parent:      53:c14490f0ccdf
|  user:        Uwe Brauer <oub at mat.ucm.es>
|  date:        Wed Aug 17 21:04:25 2016 +0000
|  summary:     Foos changes from 17.8
|
| @  changeset:   59:c95d1d5985e7
| |  branch:      uwe
| |  user:        Uwe Brauer <oub at mat.ucm.es>
| |  date:        Tue Aug 16 16:08:39 2016 +0000
| |  summary:     Added tag vs-4 for changeset fa9ae2bfc4bc
| |
So I just want to merge *all* changes (of the tip) from the foo branch into the
branch uwe.

What is the easiest way to do that?

Is
hg --config ui.merge=internal:foo merge 

From

https://stackoverflow.com/questions/4372103/mercurial-merge-by-abandoning-one-changeset

correct?
Thanks

Uwe Brauer