summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2016-06-24 23:09:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-06-28 18:39:02 (GMT)
commit09bdff29e1b73ce264c7ddc3e19e1269ee7c610e (patch)
treed286e7347e675d65d0c5ff7be037de8325192809 /builtin/merge.c
parent4e8161a82e5449976392517968b2d1bb56109b29 (diff)
downloadgit-09bdff29e1b73ce264c7ddc3e19e1269ee7c610e.zip
git-09bdff29e1b73ce264c7ddc3e19e1269ee7c610e.tar.gz
git-09bdff29e1b73ce264c7ddc3e19e1269ee7c610e.tar.bz2
diff: convert prep_temp_blob() to struct object_id
All of the callers of this function use struct object_id, so convert it to use struct object_id in its arguments and internally. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions