how do I continue a merge after resolving conflicts?

[Jamie Wilkinson]

This one time, at band camp, Jamie Wilkinson wrote:
>I've just tried to merge Martin's latest into my tree, in which I've
>modified bzrlib/tree.py to exclude .bzrignore from the tarball export (see
>earlier post).  I get a conflict when running 'bzr merge', and so I fix it
>up, and bzr resolve it, but now the tree's in a state where there are
>uncommitted changes; bzr merge aborts.  I realise there are uncommitted
>changes, because I was fixing the conflict, but I now want it to press on.
>
>What's the correct method of continuing?  Do I commit the half-merge, or is
>there magic that says now carry on?

Forget it; it was at the end of the merge anyway :)  Just needed to be
committed.