From: Éric Araujo <merwok@netwok.org>
Date: Thu, 28 Jul 2011 20:45:46 +0000 (+0200)
Subject: Stop ignoring Mercurial merge conflits files (#12255).
X-Git-Tag: v3.2.2rc1~56^2~1^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f834f20615d5b69b8476aea533de549808d993f;p=thirdparty%2FPython%2Fcpython.git

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.

I’m leaving the .gitignore file alone, as I don’t know how git users
work with merges and conflicts.
---

diff --git a/.hgignore b/.hgignore
index f109296b19a9..b11e43c3d494 100644
--- a/.hgignore
+++ b/.hgignore
@@ -46,8 +46,6 @@ libpython*.so*
 *.pyo
 *.pyd
 *.cover
-*.orig
-*.rej
 *~
 Lib/lib2to3/*.pickle
 Lib/test/data/*