Merge branch 'jc/apply-fix-mismerge' into maint

diff --git a/t/helper/.gitignore b/t/helper/.gitignore
index 758ed2e8fa127c2b2df9b5d526069472dddc096f..721650256e63eb51c66d5985c04bc3095f183c1c 100644 (file)
--- a/t/helper/.gitignore
+++ b/t/helper/.gitignore
@@ -16,16 +16,19 @@
 /test-match-trees
 /test-mergesort
 /test-mktemp
+/test-online-cpus
 /test-parse-options
 /test-path-utils
 /test-prio-queue
 /test-read-cache
+/test-ref-store
 /test-regex
 /test-revision-walking
 /test-run-command
 /test-sha1
 /test-sha1-array
 /test-sigchain
+/test-strcmp-offset
 /test-string-list
 /test-submodule-config
 /test-subprocess