➜

This issue tracker has been migrated to GitHub, and is currently read-only.
For more information, see the GitHub FAQs in the Python's Developer Guide.

Author r.david.murray
Recipients ncoghlan, r.david.murray
Date 2013-09-08.04:51:41
SpamBayes Score -1.0
Marked as misclassified Yes
Message-id <1378615901.42.0.388327364883.issue18967@psf.upfronthosting.co.za>
In-reply-to
Content 
For what it is worth, I haven't had a non-trivial merge conflict on Misc/NEWS for quite some time now.  It seems to me that they are much rarer than they were with svn.  (By 'trivial' I mean that the conflicts I see is that there's a new entry on 3.4 that wasn't in 3.3, and the conflict is just the addition of the new entry in the merge, which is trivial to fix.)
History
Date User Action Args
2013-09-08 04:51:41r.david.murraysetrecipients: + r.david.murray, ncoghlan
2013-09-08 04:51:41r.david.murraysetmessageid: <1378615901.42.0.388327364883.issue18967@psf.upfronthosting.co.za>
2013-09-08 04:51:41r.david.murraylinkissue18967 messages
2013-09-08 04:51:41r.david.murraycreate