From 3037bb7340f3ea74d3f90d555a44050bcbe39257 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Fri, 29 Jul 2011 12:07:31 +0200
Subject: Stop ignoring Mercurial merge conflits files (#12255).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.
---
 .hgignore | 2 --
 1 file changed, 2 deletions(-)

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