Merge branch 'js/difftool-builtin' into next
authorJunio C Hamano <gitster@pobox.com>
Sat, 15 Apr 2017 08:31:52 +0000 (01:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 15 Apr 2017 08:31:52 +0000 (01:31 -0700)
commit0040a91b86a275820af519d4df9851d0845f220b
tree2d1bd258e71527cdf0d289f1054e4f69f8b6c3d2
parent6bfc58e19aa0b7e8ce3355b17017b0bee69ed695
parent882add136fa8319832ef373b8797ef58edb80efc
Merge branch 'js/difftool-builtin' into next

Code cleanup.

* js/difftool-builtin:
  difftool: fix use-after-free