From 88b29e577f08e223aec65020aef29e602afdb054 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 10 Oct 2011 14:32:25 +0200
Subject: [PATCH] gitignore: merge top-level and tests/ .gitignore files

* tests/.gitignore: Remove; what little remained of its
contents has been moved ...
* .gitignore: ... here.
---
 .gitignore       | 5 +++++
 tests/.gitignore | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 tests/.gitignore

diff --git a/.gitignore b/.gitignore
index 03c253f..0aa84b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,6 +49,11 @@
 /tests/cspatfile
 /tests/get-mb-cur-max
 /tests/yesno.txt
+/tests/bre.script
+/tests/ere.script
+/tests/khadafy.out
+/tests/patfile
+/tests/spencer1.script
 ABOUT-NLS
 ChangeLog
 Makefile
diff --git a/tests/.gitignore b/tests/.gitignore
deleted file mode 100644
index ce503b6..0000000
--- a/tests/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bre.script
-ere.script
-khadafy.out
-patfile
-spencer1.script