Terry J. Reedy added the comment: I am not sure what you mean by 'rollback'. My experience and understanding is that once I start a merge, I must finish it somehow before doing anything else. Do you mean revert a particular problematic file (like NEWS), and hand edit?
Another backport item. test.support <-> test.test_support. ---------- components: +IDLE _______________________________________ Python tracker <rep...@bugs.python.org> <http://bugs.python.org/issue18152> _______________________________________ _______________________________________________ Python-bugs-list mailing list Unsubscribe: http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com