notes-merge: convert merge_from_diffs to struct object_id
authorBrandon Williams <bmwill@google.com>
Tue, 30 May 2017 17:30:59 +0000 (10:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Jun 2017 02:23:58 +0000 (11:23 +0900)
commit9d6babb...f9115892b7ddc58a9a3c44ae52da1712
tree7e25d35...4d2ddc47b6643428de7ba7545000ade2copy hash to clipboard (tree)
parent5237e0e...599c208d1c3f6da997c06ee18a1dc201copy hash to clipboard (diff)
notes-merge.c