Merge branch 'ab/pcre-v2' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Nov 2017 05:05:30 +0000 (14:05 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Nov 2017 05:05:30 +0000 (14:05 +0900)
Building with NO_LIBPCRE1_JIT did not disable it, which has been fixed.

* ab/pcre-v2:
grep: fix NO_LIBPCRE1_JIT to fully disable JIT

1  2 
grep.c
grep.h
diff --cc grep.c
Simple merge
diff --cc grep.h
Simple merge