Merge branch 'maint'

diff --git a/.gitignore b/.gitignore
index 8670081adf1698cdf189deb30116d50881217c84..c8c13f550317e12ccb5d3515fbc942463c8be4e0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -153,6 +153,7 @@ test-delta
 test-dump-cache-tree
 test-genrandom
 test-match-trees
+test-parse-options
 test-sha1
 common-cmds.h
 *.tar.gz