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 8e512545041592e29287af676abc677ba028934f..8c402ff3c622a1b189361490e18290b0ef1976d4 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -45,8 +45,6 @@ libpython*.so*
 *.pyo
 *.pyd
 *.cover
-*.orig
-*.rej
 *~
 Lib/lib2to3/*.pickle
 Lib/test/data/*