Merge branch 'js/difftool-builtin' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Apr 2017 07:55:05 +0000 (00:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Apr 2017 07:55:05 +0000 (00:55 -0700)
commit38df92441fe40f5d3cf40a4d365a70584345ff05
treeefe476b19067a6afa53a7e8dd89f24447d627747
parentec5a6f2818422926c7ea621359c5cb94d913e90e
parent0730dd4ffb39358f30b1a956cd9182aed1958b47
Merge branch 'js/difftool-builtin' into next

Code cleanup.

* js/difftool-builtin:
  difftool: avoid strcpy