diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-09-05 14:40:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-05 14:40:18 -0700 |
| commit | bda790474690a5e5e9963221dc0d5b66fbf01875 (patch) | |
| tree | 560ab7d7faaf24304dc0f64ec75f3c3d74c32d2f /builtin/merge-tree.c | |
| parent | Merge branch 'maint-1.8.3' into maint (diff) | |
| parent | config: do not use C function names as struct members (diff) | |
| download | tgif-bda790474690a5e5e9963221dc0d5b66fbf01875.tar.xz | |
Merge branch 'hv/config-from-blob' into maint
Compilation fix on platforms with fgetc() and friends defined as
macros.
* hv/config-from-blob:
config: do not use C function names as struct members
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions