Re: [PATCH 23/33] notes-merge: convert merge_from_diffs to struct object_id

Stefan Beller writes: >> trace_printf("\tmerge_from_diffs(base = %.7s, local = %.7s, " >> - "remote = %.7s)\n", sha1_to_hex(base), sha1_to_hex(local), >> - sha1_to_hex(remote)); >> + "remote = %.7s)\n", oid_to_hex(base), oid_to_hex(local), >> +

Re: [PATCH 23/33] notes-merge: convert merge_from_diffs to struct object_id

> @@ -505,16 +505,17 @@ static int merge_changes(struct notes_merge_options *o, > } > > static int merge_from_diffs(struct notes_merge_options *o, > - const unsigned char *base, > - const unsigned char *local, > - const

[PATCH 23/33] notes-merge: convert merge_from_diffs to struct object_id

Signed-off-by: Brandon Williams --- notes-merge.c | 31 --- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/notes-merge.c b/notes-merge.c index 9dbf7f6a3..be78f1954 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -114,8 +114,8 @@ static struct object