From: Junio C Hamano Date: Mon, 17 Apr 2017 06:29:34 +0000 (-0700) Subject: Merge branch 'js/difftool-builtin' X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=7b612c966ec3ee68fb60410db06222b7d728f965;p=git.git Merge branch 'js/difftool-builtin' Code cleanup. * js/difftool-builtin: difftool: fix use-after-free difftool: avoid strcpy --- 7b612c966ec3ee68fb60410db06222b7d728f965