Re: [PATCH 09/17] builtin/merge: convert to struct object_id

2017-01-02 Thread Michael Haggerty
On 01/01/2017 08:18 PM, brian m. carlson wrote: > Additionally convert several uses of the constant 40 into > GIT_SHA1_HEXSZ. > > Signed-off-by: brian m. carlson > --- > builtin/merge.c | 136 > > 1 file changed, 68 insertions(+), 68 dele

[PATCH 09/17] builtin/merge: convert to struct object_id

2017-01-01 Thread brian m. carlson
Additionally convert several uses of the constant 40 into GIT_SHA1_HEXSZ. Signed-off-by: brian m. carlson --- builtin/merge.c | 136 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index 00