merge-recursive: convert merge_recursive_generic() to object_id
authorbrian m. carlson <sandals@crustytoothpaste.net>
Fri, 24 Jun 2016 23:09:28 +0000 (23:09 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Jun 2016 18:39:02 +0000 (11:39 -0700)
commit4e8161a82e5449976392517968b2d1bb56109b29
tree552b128d238cb8ac3176ba31792a32866c390364
parentb4da9d62f91d66ab97815007105b42a2aa5846b5
merge-recursive: convert merge_recursive_generic() to object_id

Convert this function and the git merge-recursive subcommand to use
struct object_id.

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