]> git.ipfire.org Git - thirdparty/git.git/commit - sequencer.c
sequencer: convert do_recursive_merge to struct object_id
authorbrian m. carlson <sandals@crustytoothpaste.net>
Sat, 6 May 2017 22:10:36 +0000 (22:10 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 May 2017 06:12:58 +0000 (15:12 +0900)
commit48be4c625bf0f35309fdf501f47eb7445a9f5494
tree57c025e707cefa3ae1afadf61dfb1df3d2cb11c4
parent944cffbd18a7dbe0b4c5849da6f093c41b49ea00
sequencer: convert do_recursive_merge to struct object_id

This conversion is required to convert parse_tree_indirect.

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