Stewart Stremler <[EMAIL PROTECTED]> writes: > It would require a custom merge program for every format. There is no > general solution.
ClearCase at least includes a mechanism to hook such custom merge programs. I've seen it pop up a GUI merge manager for Rational Rose files (some of which are sort of sexps and hence "just text", but it's not doing just a text merge; it's merging logical, application-level data loaded from the two competing files). So far that's the only example I know of. Perhaps Rational has written similar mergers for its other product lines. -- Steven E. Harris -- [email protected] http://www.kernel-panic.org/cgi-bin/mailman/listinfo/kplug-list
