Re: [PATCH v2 05/36] resolve-undo: convert struct resolve_undo_info to object_id

2018-02-28 Thread Duy Nguyen
On Tue, Feb 27, 2018 at 9:01 AM, brian m. carlson wrote: > On Mon, Feb 26, 2018 at 06:25:24PM +0700, Duy Nguyen wrote: >> On Mon, Feb 26, 2018 at 4:11 AM, brian m. carlson >> wrote: >> > @@ -44,7 +44,7 @@ void resolve_undo_write(struct strbuf *sb, struct >> > string_list *resolve_undo) >> >

Re: [PATCH v2 05/36] resolve-undo: convert struct resolve_undo_info to object_id

2018-02-26 Thread brian m. carlson
On Mon, Feb 26, 2018 at 06:25:24PM +0700, Duy Nguyen wrote: > On Mon, Feb 26, 2018 at 4:11 AM, brian m. carlson > wrote: > > @@ -44,7 +44,7 @@ void resolve_undo_write(struct strbuf *sb, struct > > string_list *resolve_undo) > > for (i = 0; i < 3; i++) { > >

Re: [PATCH v2 05/36] resolve-undo: convert struct resolve_undo_info to object_id

2018-02-26 Thread Duy Nguyen
On Mon, Feb 26, 2018 at 4:11 AM, brian m. carlson wrote: > @@ -44,7 +44,7 @@ void resolve_undo_write(struct strbuf *sb, struct > string_list *resolve_undo) > for (i = 0; i < 3; i++) { > if (!ui->mode[i]) > continue; > -