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-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=7b612c966ec3ee68fb60410db06222b7d728f965;p=rit

Merge branch 'js/difftool-builtin'

Code cleanup.

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

7b612c966ec3ee68fb60410db06222b7d728f965