builtin/merge-tree: convert remaining caller of get_sha1 to object_id
commitd1a35e5c93eb57abd1133a8c55ba961cc55268a6
authorbrian m. carlson <sandals@crustytoothpaste.net>
Thu, 13 Jul 2017 23:49:19 +0000 (13 23:49 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Jul 2017 20:54:37 +0000 (17 13:54 -0700)
tree0f9dee0419315703ee26fbace34f1b89d2d94a66
parentaca6065c88617918c64c7f91388dae4d7fe49a5a
builtin/merge-tree: convert remaining caller of get_sha1 to object_id

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