:: MacCVSClient
  Screenshot: Conflict Window
 

The Conflict Window shows CVS merge conflicts in text files.

More information: Handling Conflicts.

Rev. 1.5 Legal — Copyright © 2003-2004 Jörg Bullmann