From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 21 Mar 2010 19:10:15 +0000 (+0000)
Subject: Merged revisions 79161 via svnmerge from
X-Git-Tag: v3.1.3rc1~1054
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5391211b547990b6537e47df45e98e99c11c9b94;p=python

Merged revisions 79161 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79161 | antoine.pitrou | 2010-03-21 01:22:55 +0100 (dim., 21 mars 2010) | 9 lines

  Merged revisions 79160 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r79160 | antoine.pitrou | 2010-03-21 01:21:43 +0100 (dim., 21 mars 2010) | 3 lines

    Fix overzealous .hgignore file
  ........
................
---

diff --git a/.hgignore b/.hgignore
index df3a52ec57..1212cc31f4 100644
--- a/.hgignore
+++ b/.hgignore
@@ -13,8 +13,8 @@ EUC-JISX0213.TXT
 EUC-JP.TXT
 EUC-KR.TXT
 JOHAB.TXT
-Makefile
-Makefile.pre
+Makefile$
+Makefile.pre$
 NormalizationTest-3.2.0.txt
 NormalizationTest.txt
 SHIFTJIS.TXT