two stable heads

[Ben Abbott]

I see two stable heads ...

$ hg heads
changeset:   12598:b1913cd27f76
branch:      stable
tag:         tip
user:        Ben Abbott  <address@hidden>
date:        Tue Apr 12 20:07:15 2011 -0400
summary:     data.txi: Replace xref{Data Structures} with xref{Structures}.

changeset:   12594:a3a7da1489b2
branch:      stable
parent:      12591:4727fd4dd4bb
user:        Rik <address@hidden>
date:        Mon Apr 11 19:03:32 2011 -0700
summary:     Modify func.txi discussion of output arguments to include 
discussion of isargout.

changeset:   12589:890af1cf0a86
user:        Rik <address@hidden>
date:        Mon Apr 11 11:33:08 2011 -0700
summary:     Remove deprecated and private functions from list of functions 
requiring tests.

As I expect this to be come a common occurrence, I thought I should ask ... How 
is this fixed?

Is it as simple as ...

(1) hg merge

(2) Use the merge-tool to select the proper ChangeLog

(3) hg commit -m 'Merge stable heads'

Ben