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 df3a52ec57e0bbf376c89cd05415c51b4fc5e96d..1212cc31f4c08f1d1671c0973f9396d87e83653a 100644 (file)
--- 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