hgignore,hgrc: Remove hgignore file.

diff --git a/hgignore b/hgignore
deleted file mode 100644 (file)
index 5eb2f89..0000000
--- a/hgignore
+++ /dev/null
@@ -1,38 +0,0 @@
-# Global mercurial ignore file.
-
-# Copyright (C) 2011-2012  Simon Ruderich
-#
-# This file is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this file.  If not, see <http://www.gnu.org/licenses/>.
-
-
-syntax: glob
-
-
-# Ignore Mac OS X files.
-.DS_Store
-
-# Don't track compiled object files and libraries.
-*.o
-*.dylib
-
-# Ignore Vim files.
-*.swp
-Session.vim
-
-# Ignore Python files.
-*.pyc
-
-# Ignore git and svn files.
-.git
-.svn

diff --git a/hgrc.m4 b/hgrc.m4
index b3a6aa72478fa1514a5442ae558c7d3b9eda82ed..febdc0b6d7d41bf8a8cc052cdd8a7cbc31050e1c 100644 (file)
--- a/hgrc.m4
+++ b/hgrc.m4
@@ -21,7 +21,6 @@ include(../lib.m4)
 
 [ui]
 username = Simon Ruderich <simon@ruderich.org>
-ignore = HGIGNORE
 # Use Apple's FileMerge for merge conflicts.
 merge = opendiff-merge
 

diff --git a/setup.sh b/setup.sh
index 4a4f78c0f32c4a1cb5459403ec6a82fa4f27dd99..23c1f8ea860a2e78e0212fb839c6e32b2a16f5aa 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -42,7 +42,6 @@ fi
 
 if installed hg; then
     generate m4 hgrc \
-        -DHGIGNORE=`pwd`/hgignore \
         -DOS=`os`
     link hgrc ~/.hgrc
 fi