diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:26:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:26:57 -0700 |
| commit | 32f90258bd510d84dfe8970211ec1427e9e327dc (patch) | |
| tree | 6727e0574f5c648aec927e43545617b0c5fca32e /builtin/merge-ours.c | |
| parent | Merge branch 'rs/bswap-ubsan-fix' (diff) | |
| parent | ls-files: don't try to prune an empty index (diff) | |
| download | tgif-32f90258bd510d84dfe8970211ec1427e9e327dc.tar.xz | |
Merge branch 'rs/move-array'
Code clean-up.
* rs/move-array:
ls-files: don't try to prune an empty index
apply: use COPY_ARRAY and MOVE_ARRAY in update_image()
use MOVE_ARRAY
add MOVE_ARRAY
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions