Merge branch 'jc/merge-sans-branch'

diff --git a/.gitignore b/.gitignore
index 3dd6ef7d259d8fe2811f68525b5309e97c79f4cc..c460c66766ab590239e4ae9107bb55b9fd30fac6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -170,6 +170,7 @@
 /test-index-version
 /test-line-buffer
 /test-match-trees
+/test-mktemp
 /test-obj-pool
 /test-parse-options
 /test-path-utils