Merge branch 'js/difftool-builtin'

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

Junio C Hamano committed Apr 16, 2017 at 23:29 UTC 7b612c966ec3ee68fb60410db06222b7d728f965

No changes.