R. David Murray added the comment: I agree with Antoine, but then as I said I don't run into huge merge conflicts very often. ---------- _______________________________________ Python tracker <report at bugs.python.org> <http://bugs.python.org/issue18967> _______________________________________