Éric Araujo <mer...@netwok.org> added the comment: I would also propose to remove *.rej and *.orig from the ignore files. It’s helpful to see them in hg status in case you had a difficult merge and did not fix all files. My usage is that I remove *.rej and *.orig after I’m done merging (or checking that the revert is okay).
---------- title: Make VCSes ignore shared libpython -> A few changes to .*ignore _______________________________________ Python tracker <rep...@bugs.python.org> <http://bugs.python.org/issue12255> _______________________________________ _______________________________________________ Python-bugs-list mailing list Unsubscribe: http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com