diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:26:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:26:58 -0700 |
| commit | 12deaf66d468c050eafc0033f96892409d7f6701 (patch) | |
| tree | 69094befb78d8d61c8770bc7456dd0416f5e0eda /builtin/merge.c | |
| parent | Merge branch 'rs/move-array' (diff) | |
| parent | dir: support platforms that require aligned reads (diff) | |
| download | tgif-12deaf66d468c050eafc0033f96892409d7f6701.tar.xz | |
Merge branch 'rs/stat-data-unaligned-reads-fix'
Code clean-up.
* rs/stat-data-unaligned-reads-fix:
dir: support platforms that require aligned reads
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions