Merge branch 'js/unmap-before-ext-diff'
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Jul 2019 20:59:21 +0000 (13:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Jul 2019 20:59:21 +0000 (13:59 -0700)
commitd9beb468e6d0c493eed00e365d90a69127488caa
tree008d7ea46d0ea09f4d4527e1c0fb2b2e2e72095d
parent43ba21cb574ee3f9a1acf4580868982f4c883ac6
parent3aef54e8b82bc02b9cebbb7d0bed8911ee0418e3
Merge branch 'js/unmap-before-ext-diff'

Windows update.

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