From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Jul 2019 19:38:11 +0000 (-0700)
Subject: Merge branch 'js/unmap-before-ext-diff' into maint
X-Git-Tag: v2.23.0-rc0~1^2~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58f6cfd8ce3c4621d4a772b81b7c92f7519154f1;p=thirdparty%2Fgit.git

Merge branch 'js/unmap-before-ext-diff' into maint

Windows update.

* js/unmap-before-ext-diff:
  diff: munmap() file contents before running external diff
---

58f6cfd8ce3c4621d4a772b81b7c92f7519154f1