Merge branch 'js/unmap-before-ext-diff' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Jul 2019 19:38:11 +0000 (12:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Jul 2019 19:38:11 +0000 (12:38 -0700)
Windows update.

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

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