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)
commit7b612c966ec3ee68fb60410db06222b7d728f965
treeb8499e5afa7927424abde334f2150524e3210389
parentc8a8951ce56e497775784babb025e0c26a889f7c
parent882add136fa8319832ef373b8797ef58edb80efc
Merge branch 'js/difftool-builtin'

Code cleanup.

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