Re: merge mode for XML

[Pierre Asselin]

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?