Hello, I'm just looking for a nice GUI way to merge conflicts resulting from cvs update or cvs commit without having to go through the tidyness of editing stuff like this:
<<<<<<< filename your changes ======= code merged from repository >>>>>>> revision I'm working on the Windows platform. Helge F. _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
