summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-14 16:20:15 -0700
committerJunio C Hamano <junkio@cox.net>2006-05-14 16:20:15 -0700
commit975bf9cf5ad5d440f98f464ae8124609a4835ce1 (patch)
tree46949dec51c6df5416b8190bfddc73b226a5dd2f /combine-diff.c
parent5f7f211a54cb62fba4f017cdf3b9bc0c3a7843e1 (diff)
parentd9635e9c539465792b1920437b52fa8792a71650 (diff)
downloadgit-975bf9cf5ad5d440f98f464ae8124609a4835ce1.tar.gz
Merge branch 'fix'
* fix: include header to define uint32_t, necessary on Mac OS X
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions