svn commit: r346018 - head/sys/conf

[Warner Losh]

On Wed, Mar 4, 2020 at 10:27 PM Alan Somers <asomers at freebsd.org> wrote:

> On Sun, Apr 7, 2019 at 12:40 PM Warner Losh <imp at freebsd.org> wrote:
>
>> Author: imp
>> Date: Sun Apr  7 18:39:55 2019
>> New Revision: 346018
>> URL: https://svnweb.freebsd.org/changeset/base/346018
>>
>> Log:
>>   Use default shell assignment rather more complicated if then
>>   construct.
>>
>>   Discussed with: emaste@, allanjude@ (changes (or not) based on their
>> feedback)
>>   Differential Revision: https://reviews.freebsd.org/D19797
>>
>
> Can we MFC this to stable/12?  Before this change, setting BRANCH_OVERRIDE
> during "make release" would have no effect.
>

Sure thing. There was a merge conflict, which makes sense, but I think I
resolved it correctly.

Warner