Re: Emacs antialiasing in X

[David Abrahams]

"Jan D." <address@hidden> writes:

>>
>> Are you keeping a tag on the trunk for the last revision you've merged
>> into your branch?  If so,
>>
>>      cvs up -jLastMergeTag -jHEAD
>>
>> should get you an incremental merge with no bogus conflicts.  And then
>> I could use your LastMergeTag to merge with emacs-unicode-2 with fewer
>> conflicts as well.
>
> No tag, but you can use the date specifier, the cvs log message gives
> the date.

Thanks, I'll do that.  FWIW, if you do use such tags you can
substantially reduce the number of conflicts you see upon merging.

-- 
Dave Abrahams
Boost Consulting
www.boost-consulting.com