On Wed, Oct 7, 2009 at 3:32 PM, Gary Mazz <garymazzaferro@gmail.com> wrote:
Hi,

The document check in  has  not been merged with other changes,
effectively  discarding them.

PLEASE MERGE THE FILE BEFORE CHECKING A FILE IN !!

Sorry, that may well have been me. Usually hg tells me if there's problems but I'm guessing it didn't because I'm on a new machine :/

Sam