|
From: | Jan D. |
Subject: | Re: Emacs antialiasing in X |
Date: | Mon, 16 Jan 2006 20:04:06 +0100 |
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.
Jan D.
[Prev in Thread] | Current Thread | [Next in Thread] |