From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 21 Mar 2010 00:24:41 +0000 (+0000)
Subject: Merged revisions 79160 via svnmerge from
X-Git-Tag: v2.6.6rc1~583
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa43e152b372ce3aa3dc8ca65ef943027c0cca42;p=python

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