mergemaster goof when src upgrading 7.0 -> 7.1

[Peter Boosten]

Yuri Pankov wrote:
> On Wed, Jan 07, 2009 at 07:06:53AM +0100, Peter Boosten wrote:
>>
>> Also: most scripts updated by mergemaster during 7.0->7.1 are only
>> version numbering diffs. Is there no smarter way to do this, apart from
>> typing 'i' every time?
> 
> I think you want -U option (auto upgrade files that have not been
> modified by user) along with -i (install missing files).

After reading the man page the -s option seems to be more appropriate
(unless I misread that bit, of course :-) ).

Peter

-- 
http://www.boosten.org