Merge branch 'js/difftool-builtin'
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Apr 2017 06:29:34 +0000 (23:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Apr 2017 06:29:34 +0000 (23:29 -0700)
Code cleanup.

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

Trivial merge