mercurial (again)

I am trying to committ a huge edit to the RDF-MT. It tells me "abort: unresolved merge conflicts (see hg help resolve)"

What the hell is it talking about?? Anyone??

Pat

------------------------------------------------------------
IHMC                                     (850)434 8903 or (650)494 3973   
40 South Alcaniz St.           (850)202 4416   office
Pensacola                            (850)202 4440   fax
FL 32502                              (850)291 0667   mobile
phayesAT-SIGNihmc.us       http://www.ihmc.us/users/phayes

Received on Friday, 10 May 2013 02:28:46 UTC