summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-04-17 06:29:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-04-17 06:29:34 (GMT)
commit7b612c966ec3ee68fb60410db06222b7d728f965 (patch)
treeb8499e5afa7927424abde334f2150524e3210389 /combine-diff.c
parentc8a8951ce56e497775784babb025e0c26a889f7c (diff)
parent882add136fa8319832ef373b8797ef58edb80efc (diff)
downloadgit-7b612c966ec3ee68fb60410db06222b7d728f965.zip
git-7b612c966ec3ee68fb60410db06222b7d728f965.tar.gz
git-7b612c966ec3ee68fb60410db06222b7d728f965.tar.bz2
Merge branch 'js/difftool-builtin'
Code cleanup. * js/difftool-builtin: difftool: fix use-after-free difftool: avoid strcpy
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions