Re: nonmergeable file needs merge

[Larry Jones]

David Everly writes:
> 
> So I tried:
> 
> * -k 'b' -m 'MERGE'
> 
> However, the problem still happens...possibly because all the files
> were checked in on the earlier configuration.

Binary mode forces nomerge.  As you already discovered, the correct way
to do this is to use -ko.

-Larry Jones

Isn't it sad how some people's grip on their lives is so precarious
that they'll embrace any preposterous delusion rather than face an
occasional bleak truth? -- Calvin