On Thu, 2004-02-12 at 23:32 +0000, Rowan Collins wrote:
These are all pretty much in the same ballpark. I think the scale is
such that a manual solution (such as merging with -kk, then copying over
the binary files by hand from one or the other branch, and hand-checking
them for correctness) would be impracticable and error prone. Of course,
if that's what the release manager(s) want to do, I won't stop them.
~ESP
--
Evan Prodromou <evan(a)wikitravel.org>