I have a pair of commits that should really be just one. If I was using git, I would use:
git rebase -i
and then
Yes, you can do this using mercurial without any extensions by Concatenating Changesets.
Alternately if you want to use an extension you could use: