Would an incremental merge between files be sufficient? Or do you want incremental merge within one file as well?
I think between files is sufficient. At least that's the model that Teamware provided and it seemed to work well for cases with large numbers of files in conflict.
dsc _______________________________________________ tools-discuss mailing list tools-discuss@opensolaris.org
