svn: head/usr.sbin/mergemaster

[Doug Barton]

Maxim Sobolev wrote:
> Doug Barton wrote:
>> Author: dougb
>> Date: Thu Jan  1 10:55:26 2009
>> New Revision: 186677
>> URL: http://svn.freebsd.org/changeset/base/186677
>>
>> Log:
>>   Revert 184781, 184804, and 184832 (automatic installation of files
>>   that differ only by VCS Id) for the following reasons:
>>   1. It was added without my consent, review, or even a heads up
> 
> Huh? I sent you request for review on 24 October 2008

If that's the case then I apologize, I've been extremely overloaded
lately and it's possible that this fell through the cracks.

My other objections remain however, including the one about the -U
option being a better solution that requires no new code.

Doug

-- 

    This .signature sanitized for your protection