From: Éric Araujo <merwok@netwok.org>
Date: Fri, 29 Jul 2011 10:07:31 +0000 (+0200)
Subject: Stop ignoring Mercurial merge conflits files (#12255).
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3037bb7340f3ea74d3f90d555a44050bcbe39257;p=python

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.
---

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