summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2016-01-05 20:21:03 +0200
committerEli Zaretskii <eliz@gnu.org>2016-01-05 20:21:03 +0200
commit6a311d2072b8a4ea530d9a541e661a8ad11bb1d7 (patch)
treee8229171021ae34b506864db392177a87d722162 /.gitignore
parent22d1a175aa4b33296a7f2fe0cde9a22333f4031d (diff)
downloademacs-6a311d2072b8a4ea530d9a541e661a8ad11bb1d7.tar.gz
Fix fallout from merging emacs-25 branch in test/
* .gitignore: Update for the new place of biditest.txt. * test/automated/: Directory removed. All files moved to their proper places. * test/etags/: Directory removed. All files moved to their proper places. * test/automated/url-parse-tests.el: File removed; it was an exact copy of the same file in test/lisp/url/. * test/automated/url-expand-tests.el: Moved to test/lisp/url/.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index a8f0e9a2486..94c4ba8e4bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -152,7 +152,7 @@ src/*.map
# Tests.
test/indent/*.new
-test/biditest.txt
+test/manual/biditest.txt
test/manual/etags/srclist
test/manual/etags/regexfile
test/manual/etags/ETAGS