http://hg.python.org/cpython/rev/4e5127874adf changeset: 71590:4e5127874adf branch: 2.7 user: Éric Araujo <merwok@netwok.org> date: Fri Jul 29 12:07:31 2011 +0200 summary: Stop ignoring Mercurial merge conflits files (#12255). R. David Murray and I think that it’s more useful to have these files show up in the output of “hg status”, to let the user know that some merged file have to be checked before commit. If you want to ignore these files in your clones, it’s possible to do so from another ignore file; see the bug report for directions. files: .hgignore | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -45,8 +45,6 @@ *.pyo *.pyd *.cover -*.orig -*.rej *~ Lib/lib2to3/*.pickle Lib/test/data/* -- Repository URL: http://hg.python.org/cpython