Merge branch 'ab/pcre-v2'
authorJunio C Hamano <gitster@pobox.com>
Sat, 24 Jun 2017 21:28:36 +0000 (14:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 24 Jun 2017 21:28:36 +0000 (14:28 -0700)
Hotfix for a topic already in 'master'.

* ab/pcre-v2:
grep: fix erroneously copy/pasted variable in check/assert pattern

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