Mackram wrote: > > That is really weird leslie unless somehting changed again. Can you > send me the output of hg resolve cause i ma not getting that.
I get this when I check out the current versions of -dev and your branch, then try to pull and merge your branch into -dev. Leslie --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "weblocks" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/weblocks?hl=en -~----------~----~----~----~------~----~------~--~---
