]> git.ipfire.org Git - thirdparty/git.git/commitdiff
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)
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