➜

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 orsenthil
Recipients eric.araujo, orsenthil
Date 2011-06-19.17:00:25
SpamBayes Score 0.016607204
Marked as misclassified No
Message-id <1308502826.29.0.547747001838.issue12255@psf.upfronthosting.co.za>
In-reply-to
Content 
+libpython*.so*  is fine, but please don't remove the rej and orig. By convention and practice, those files are meant to be in .ignore files to prevent accidental checkins.  Usually when the conflict occurs you are notified immediately and you fix them subsequently. Being notified of pending merge by seeing the.rej files in the hg status seems remote to me.
History
Date User Action Args
2011-06-19 17:00:26orsenthilsetrecipients: + orsenthil, eric.araujo
2011-06-19 17:00:26orsenthilsetmessageid: <1308502826.29.0.547747001838.issue12255@psf.upfronthosting.co.za>
2011-06-19 17:00:25orsenthillinkissue12255 messages
2011-06-19 17:00:25orsenthilcreate