]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'rj/compat-regex-size-max-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:06:38 +0000 (13:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:06:38 +0000 (13:06 -0700)
A compilation fix.

* rj/compat-regex-size-max-fix:
  regex: fix a SIZE_MAX macro redefinition warning


Trivial merge