[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: merge mode for XML

From: Pierre Asselin
Subject: Re: merge mode for XML
Date: Sat, 4 May 2002 03:04:54 +0000 (UTC)
User-agent: nn/6.6.3

In <address@hidden> address@hidden (Greg A. Woods) writes:

>It could be a good idea, if it were modified slightly.  Since the type
>of content in a CVS RCS file revision can change from one revision to
>another the type of merge tool must be declared in a newphrase in each
>deltatext section.

That would be the type of the *file*, not the merge tool.  In a
three-way merge, the tool would depend on the three newphrases
of the revisions involved.  Ain't that fun?

reply via email to

[Prev in Thread] Current Thread [Next in Thread]