2012/2/18, Nicolas M. Thiery <nicolas.thi...@u-psud.fr>: > Hi Florent, Vincent, > > All my edits in the series file to carefully craft guards on the > patches that are already merged in 5.0 got discarded in one of the > recent merge! > > I reinstated them, so the queue should work again ...
That should be me! I made small changes at various places in series. I appoligize. I'm a bit stuck by the procedure after hg merge. vi opens with three windows. The one on the left is clearly what remains at the end, the one in the middle should be the one from the update and the one on the right the original. Is that true ? Vincent -- You received this message because you are subscribed to the Google Groups "sage-combinat-devel" group. To post to this group, send email to sage-combinat-devel@googlegroups.com. To unsubscribe from this group, send email to sage-combinat-devel+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/sage-combinat-devel?hl=en.
