summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-09-18 17:58:00 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-09-18 17:58:00 -0700
commit9b8074427bd2bb52d0c7ec876ebe0e6834bb69fe (patch)
tree2878fe56589a29032ac39c6d2c763452045f464b /builtin/merge-ours.c
parentFourteenth batch (diff)
parentpack-bitmap-write: use hashwrite_be32() in write_hash_cache() (diff)
downloadtgif-9b8074427bd2bb52d0c7ec876ebe0e6834bb69fe.tar.xz
Merge branch 'rs/misc-cleanups'
Misc cleanups. * rs/misc-cleanups: pack-bitmap-write: use hashwrite_be32() in write_hash_cache() midx: use hashwrite_u8() in write_midx_header() fast-import: use write_pack_header()
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions