> FYI, TortoiseCVS no longer uses the CVS Conflict Editor - instead we > parse the conflict file and invoke a standard diff/merge tool > allowing > the user to easily see the conflicting lines side-by-side. And It's a Very Good Thing, too! TortoiseCVS rocks :) Glen Starrett