From 2f834f20615d5b69b8476aea533de549808d993f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Thu, 28 Jul 2011 22:45:46 +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. I’m leaving the .gitignore file alone, as I don’t know how git users work with merges and conflicts. --- .hgignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.hgignore b/.hgignore index f109296..b11e43c 100644 --- a/.hgignore +++ b/.hgignore @@ -46,8 +46,6 @@ libpython*.so* *.pyo *.pyd *.cover -*.orig -*.rej *~ Lib/lib2to3/*.pickle Lib/test/data/* -- cgit v0.12