diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-25 19:05:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-25 19:05:02 (GMT) |
| commit | 0bc8bea2b4d73b20ce418b88300f498396d0a924 (patch) | |
| tree | 54daaa09d4b2993fefa334cc4d8e9860a80037d9 /resolve-undo.h | |
| parent | ec04a275b495a7d786b49aeca2eef7f45fb00c48 (diff) | |
| parent | 8072766cc6756e9218ea7c9433b097b696329407 (diff) | |
| download | git-0bc8bea2b4d73b20ce418b88300f498396d0a924.zip git-0bc8bea2b4d73b20ce418b88300f498396d0a924.tar.gz git-0bc8bea2b4d73b20ce418b88300f498396d0a924.tar.bz2 | |
Merge branch 'rs/xdiff-fast-hash-fix'
Fixes compilation issue on 32-bit in an earlier series.
Diffstat (limited to 'resolve-undo.h')
0 files changed, 0 insertions, 0 deletions