diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-04-24 12:31:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-24 12:31:51 -0700 |
| commit | 1697bf30df3ec6c28b180bc290d7d11d2fe97562 (patch) | |
| tree | cf881eb498bc11f9f593323d57b7c43e91bb474b /git-merge-octopus.sh | |
| parent | Merge branch 'fc/transport-helper-sync-error-fix' (diff) | |
| parent | ewah_bitmap.c: do not assume size_t and eword_t are the same size (diff) | |
| download | tgif-1697bf30df3ec6c28b180bc290d7d11d2fe97562.tar.xz | |
Merge branch 'jk/pack-bitmap'
A last minute (and hopefully the last) fix to avoid coredumps due
to an incorrect pointer arithmetic.
* jk/pack-bitmap:
ewah_bitmap.c: do not assume size_t and eword_t are the same size
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions