The darn thing accidentally created a branch. I had to copy a half-dozen
authorRob Landley <rob@landley.net>
Thu, 2 Nov 2006 03:19:34 +0000 (22:19 -0500)
committerRob Landley <rob@landley.net>
Thu, 2 Nov 2006 03:19:34 +0000 (22:19 -0500)
commit1f24e8080858e62794ba4d2869a3ae1e383e47e7
treeb593a9289b54c00ed5663fc6bafe3fa14e79fa4a
parent52fb04274b3491fdfe91b2e5acc23dc3f3064a86
parent6ccb1b7897a12ccec511f60e41e8f54c81fcdd6d
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.