From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 21 Mar 2010 00:22:55 +0000 (+0000)
Subject: Merged revisions 79160 via svnmerge from
X-Git-Tag: v3.2a1~1381
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75634948771e3329fea1675cdac409bfa0893992;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 3520dbd6a2..349b11c0c3 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,8 +1,8 @@
 .gdb_history
 .purify
 .svn
-Makefile
-Makefile.pre
+Makefile$
+Makefile.pre$
 TAGS
 autom4te.cache
 build