notes-merge: convert merge_from_diffs to struct object_id