summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-23 10:27:42 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-23 10:27:42 -0700
commit34ad5a52b44d1b95f3b8833c02a0920f3454755b (patch)
tree633ed4e6b0d487b4b65202b9fcfbe6e4670b0785 /git-mergetool.sh
parentMerge branch 'js/mingw-shutdown' (diff)
parentdo not read beyond end of malloc'd buffer (diff)
downloadtgif-34ad5a52b44d1b95f3b8833c02a0920f3454755b.tar.xz
Merge branch 'jm/maint-diff-words-with-sbe'
* jm/maint-diff-words-with-sbe: do not read beyond end of malloc'd buffer
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions