The darn thing accidentally created a branch. I had to copy a half-dozen

The darn thing accidentally created a branch.  I had  to copy a half-dozen
files to temporary locations to get them out of the way of the merge, and
the next checkin will be putting them _back_.  This commit is entirely to
humor mercurial, and if I could figure out how to avoid getting it in this
weird state, I would.