Jeremy Hylton <[EMAIL PROTECTED]> writes: >> 29 conflicts > > Oh. That's not as bad as I expected.
Proceeding.... >> Major conflict: >> Python/compile.c (Probably not merged during 1st merge) > > I think that's right. I didn't merge any of the changes, then. > >> Lib/test/test_compile.c (ditto) > > Probably. So maybe it's not necessary to merge these two; just leave them behind? That would lighten the load quite a bit. -- KBK _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
