On Wed, Apr 11, 2001 at 06:06:22PM -0700, Paul Sander wrote:
> - If a branch is merged multiple times to an ancestor, don't count the
> result of the prior merge as a conflict. (Remember, CVS performs a
As I said in an earlier post, this can be scripted around.
> - Invoke a type-specific merge tool, ideally one of the user's choice.
Actually, simply "an external tool. Period" would be sufficient. Then
said external tool can have whatever intelligence it wants to determine
filetype and such. No need to push that into CVS.
mrc
--
Mike Castle Life is like a clock: You can work constantly
[EMAIL PROTECTED] and be right all the time, or not work at all
www.netcom.com/~dalgoda/ and be right at least twice a day. -- mrc
We are all of us living in the shadow of Manhattan. -- Watchmen
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
