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 3520dbd6a21af76aff5feee7f393ec827ec3f7aa..349b11c0c3069798a1a8d00e43190d809d56e843 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -1,8 +1,8 @@
 .gdb_history
 .purify
 .svn
-Makefile
-Makefile.pre
+Makefile$
+Makefile.pre$
 TAGS
 autom4te.cache
 build