Merge branch 'rs/xdiff-fast-hash-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 25 May 2012 19:05:02 +0000 (12:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 25 May 2012 19:05:02 +0000 (12:05 -0700)
commit0bc8bea2b4d73b20ce418b88300f498396d0a924
tree54daaa09d4b2993fefa334cc4d8e9860a80037d9
parentec04a275b495a7d786b49aeca2eef7f45fb00c48
parent8072766cc6756e9218ea7c9433b097b696329407
Merge branch 'rs/xdiff-fast-hash-fix'

Fixes compilation issue on 32-bit in an earlier series.
xdiff/xutils.c