notes-merge: convert merge_from_diffs to struct object_id
commit9d6babb2f9115892b7ddc58a9a3c44ae52da1712
authorBrandon Williams <bmwill@google.com>
Tue, 30 May 2017 17:30:59 +0000 (30 10:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Jun 2017 02:23:58 +0000 (5 11:23 +0900)
tree7e25d3594d2ddc47b6643428de7ba7545000ade2
parent5237e0eb599c208d1c3f6da997c06ee18a1dc201
notes-merge: convert merge_from_diffs to struct object_id

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
notes-merge.c