Re: [PATCH v5 3/5] merge: Make 'merge.log' an integer or boolean option

This makes sense, but I agree with Jonathan's reviews on 1/5 and 2/5, I'll
ask you to reroll this on top of what I'll push out shortly.

As to 4/5, I think we should proceed a lot more carefully than what your
patch does, just like we were extra careful when we went to v1.7.0 than
when we went to v1.6.0 (see release notes to 1.6.6 for a summary,
especially paying attention to the third and the fourth paragraph in
"Preparing yourselves" section).

I've queued 5/5 directly on maint.

Thanks.