From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Apr 2017 06:29:34 +0000 (-0700)
Subject: Merge branch 'js/difftool-builtin'
X-Git-Tag: v2.13.0-rc0~19
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7b612c966ec3ee68fb60410db06222b7d728f965?hp=--cc

Merge branch 'js/difftool-builtin'

Code cleanup.

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

7b612c966ec3ee68fb60410db06222b7d728f965