diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-09-19 11:04:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-19 11:04:25 -0700 |
| commit | 79e46c9fed837c565eac8d81448641d6b944a928 (patch) | |
| tree | b8d6edd9e3f8df1b70a6e980736fcb5ac601cc70 /merge-recursive.c | |
| parent | Merge branch 'maint' (diff) | |
| parent | compat/mingw.h: define PRId64 (diff) | |
| download | tgif-79e46c9fed837c565eac8d81448641d6b944a928.tar.xz | |
Merge branch 'jk/config-int-range-check'
* jk/config-int-range-check:
compat/mingw.h: define PRId64
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions