Il giorno 24 ottobre 2012 13:41, Jeroen Demeyer <[email protected]> ha scritto:
> This looks like a marker from a failed merge. Probably you're right. I tried to understand what was the problem with mercurial and I tried the suggested "hg ...something" command for auto-fixing merging, but probably it didn't work. Is there a way to redo the merge? Please apology if I'm missing something, at the beginning I thought it was sufficient to run a sage -upgrade with the URL. :) Thank you. -- *Andrea Lazzarotto* - http://andrealazzarotto.com* * -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. Visit this group at http://groups.google.com/group/sage-devel?hl=en.
