]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
merge-recursive: convert leaf functions to use struct object_id
authorbrian m. carlson <sandals@crustytoothpaste.net>
Fri, 24 Jun 2016 23:09:27 +0000 (23:09 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Jun 2016 18:39:02 +0000 (11:39 -0700)
commitb4da9d62f91d66ab97815007105b42a2aa5846b5
tree00e073785a16905c4777d74289aafe18b029005c
parent9b561499963d3f8b9ad15f5eae667ec5558f5af1
merge-recursive: convert leaf functions to use struct object_id

Convert all but two of the static functions in this file to use struct
object_id.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c