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 a0868faf242f4f2e5fb7d337557c0dcfd281882c..066103ade360e6c616728ba219eb88b3413fd56b 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
@@ -66,4 +66,4 @@ PCbuild/*.exp
 PCbuild/*.o
 PCbuild/*.ncb
 PCbuild/*.bsc
-PCbuild/Win32-temp-*
\ No newline at end of file
+PCbuild/Win32-temp-*